[7613] Merge branch 'trunk' into ssh_auth_dialog (Ttssh2-commit) - Tera Term

Revision: 7613
          https://osdn.net/projects/ttssh2/scm/svn/commits/7613
Author:   zmatsuo
Date:     2019-04-24 23:08:16 +0900 (Wed, 24 Apr 2019)
Log Message:
-----------
Merge branch 'trunk' into ssh_auth_dialog

Modified Paths:
--------------
    branches/ssh_auth_dialog/CMakeLists.txt
    branches/ssh_auth_dialog/TTProxy/ProxyWSockHook.h
    branches/ssh_auth_dialog/TTProxy/TTProxy.cpp
    branches/ssh_auth_dialog/TTProxy/TTProxy.h
    branches/ssh_auth_dialog/TTProxy/TTProxy.rc
    branches/ssh_auth_dialog/TTProxy/TTProxy.v10.vcxproj
    branches/ssh_auth_dialog/TTProxy/TTProxy.v10.vcxproj.filters
    branches/ssh_auth_dialog/TTProxy/TTProxy.v11.vcxproj
    branches/ssh_auth_dialog/TTProxy/TTProxy.v11.vcxproj.filters
    branches/ssh_auth_dialog/TTProxy/TTProxy.v12.vcxproj
    branches/ssh_auth_dialog/TTProxy/TTProxy.v12.vcxproj.filters
    branches/ssh_auth_dialog/TTProxy/TTProxy.v14.vcxproj
    branches/ssh_auth_dialog/TTProxy/TTProxy.v14.vcxproj.filters
    branches/ssh_auth_dialog/TTProxy/TTProxy.v15.vcxproj
    branches/ssh_auth_dialog/TTProxy/TTProxy.v15.vcxproj.filters
    branches/ssh_auth_dialog/TTProxy/TTProxy.v9.vcproj
    branches/ssh_auth_dialog/TTProxy/TTProxy.vcproj
    branches/ssh_auth_dialog/TTProxy/YCL/include/YCL/Array.h
    branches/ssh_auth_dialog/TTProxy/YCL/include/YCL/Dialog.h
    branches/ssh_auth_dialog/TTProxy/YCL/include/YCL/HASHCODE.h
    branches/ssh_auth_dialog/TTProxy/YCL/include/YCL/Hashtable.h
    branches/ssh_auth_dialog/TTProxy/YCL/include/YCL/common.h
    branches/ssh_auth_dialog/TTXKanjiMenu/CMakeLists.txt
    branches/ssh_auth_dialog/TTXKanjiMenu/ttxkanjimenu.rc
    branches/ssh_auth_dialog/TTXKanjiMenu/ttxkanjimenu.vcproj
    branches/ssh_auth_dialog/TTXSamples/TTXAdditionalTitle/CMakeLists.txt
    branches/ssh_auth_dialog/TTXSamples/TTXAdditionalTitle/TTXAdditionalTitle.vcproj
    branches/ssh_auth_dialog/TTXSamples/TTXAlwaysOnTop/CMakeLists.txt
    branches/ssh_auth_dialog/TTXSamples/TTXAlwaysOnTop/TTXAlwaysOnTop.c
    branches/ssh_auth_dialog/TTXSamples/TTXAlwaysOnTop/TTXAlwaysOnTop.vcproj
    branches/ssh_auth_dialog/TTXSamples/TTXCallSysMenu/CMakeLists.txt
    branches/ssh_auth_dialog/TTXSamples/TTXCallSysMenu/TTXCallSysMenu.vcproj
    branches/ssh_auth_dialog/TTXSamples/TTXCommandLineOpt/CMakeLists.txt
    branches/ssh_auth_dialog/TTXSamples/TTXCopyIniFile/CMakeLists.txt
    branches/ssh_auth_dialog/TTXSamples/TTXFixedWinSize/CMakeLists.txt
    branches/ssh_auth_dialog/TTXSamples/TTXFixedWinSize/TTXFixedWinSize.vcproj
    branches/ssh_auth_dialog/TTXSamples/TTXKcodeChange/CMakeLists.txt
    branches/ssh_auth_dialog/TTXSamples/TTXOutputBuffering/CMakeLists.txt
    branches/ssh_auth_dialog/TTXSamples/TTXRecurringCommand/CMakeLists.txt
    branches/ssh_auth_dialog/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.c
    branches/ssh_auth_dialog/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.v10.vcxproj
    branches/ssh_auth_dialog/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.v10.vcxproj.filters
    branches/ssh_auth_dialog/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.v11.vcxproj
    branches/ssh_auth_dialog/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.v11.vcxproj.filters
    branches/ssh_auth_dialog/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.v12.vcxproj
    branches/ssh_auth_dialog/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.v12.vcxproj.filters
    branches/ssh_auth_dialog/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.v14.vcxproj
    branches/ssh_auth_dialog/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.v14.vcxproj.filters
    branches/ssh_auth_dialog/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.v15.vcxproj
    branches/ssh_auth_dialog/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.v15.vcxproj.filters
    branches/ssh_auth_dialog/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.v9.vcproj
    branches/ssh_auth_dialog/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.vcproj
    branches/ssh_auth_dialog/TTXSamples/TTXResizeMenu/CMakeLists.txt
    branches/ssh_auth_dialog/TTXSamples/TTXResizeMenu/TTXResizeMenu.vcproj
    branches/ssh_auth_dialog/TTXSamples/TTXResizeWin/CMakeLists.txt
    branches/ssh_auth_dialog/TTXSamples/TTXResizeWin/TTXResizeWin.vcproj
    branches/ssh_auth_dialog/TTXSamples/TTXShowCommandLine/CMakeLists.txt
    branches/ssh_auth_dialog/TTXSamples/TTXShowCommandLine/TTXShowCommandLine.vcproj
    branches/ssh_auth_dialog/TTXSamples/TTXViewMode/CMakeLists.txt
    branches/ssh_auth_dialog/TTXSamples/TTXViewMode/TTXViewMode.c
    branches/ssh_auth_dialog/TTXSamples/TTXViewMode/TTXViewMode.v10.vcxproj
    branches/ssh_auth_dialog/TTXSamples/TTXViewMode/TTXViewMode.v11.vcxproj
    branches/ssh_auth_dialog/TTXSamples/TTXViewMode/TTXViewMode.v12.vcxproj
    branches/ssh_auth_dialog/TTXSamples/TTXViewMode/TTXViewMode.v14.vcxproj
    branches/ssh_auth_dialog/TTXSamples/TTXViewMode/TTXViewMode.v15.vcxproj
    branches/ssh_auth_dialog/TTXSamples/TTXViewMode/TTXViewMode.v9.vcproj
    branches/ssh_auth_dialog/TTXSamples/TTXViewMode/TTXViewMode.vcproj
    branches/ssh_auth_dialog/TTXSamples/TTXttyrec/TTXttyplay.c
    branches/ssh_auth_dialog/TTXSamples/TTXttyrec/TTXttyplay.vcproj
    branches/ssh_auth_dialog/TTXSamples/TTXttyrec/TTXttyrec.c
    branches/ssh_auth_dialog/TTXSamples/TTXttyrec/TTXttyrec.vcproj
    branches/ssh_auth_dialog/TTXSamples/TTXttyrec/gettimeofday.c
    branches/ssh_auth_dialog/TTXSamples/TTXttyrec/gettimeofday.h
    branches/ssh_auth_dialog/TTXSamples/ttxtest/CMakeLists.txt
    branches/ssh_auth_dialog/TTXSamples/ttxtest/TTXtest.vcproj
    branches/ssh_auth_dialog/doc/convtext.bat
    branches/ssh_auth_dialog/doc/en/html/about/history.html
    branches/ssh_auth_dialog/doc/en/html/index.html
    branches/ssh_auth_dialog/doc/en/html/menu/setup-font.html
    branches/ssh_auth_dialog/doc/en/html/reference/develop.txt
    branches/ssh_auth_dialog/doc/en/teraterm.hhc
    branches/ssh_auth_dialog/doc/ja/html/about/history.html
    branches/ssh_auth_dialog/doc/ja/html/index.html
    branches/ssh_auth_dialog/doc/ja/html/menu/setup-font.html
    branches/ssh_auth_dialog/doc/ja/html/reference/build_with_cmake.md
    branches/ssh_auth_dialog/doc/ja/html/reference/develop.txt
    branches/ssh_auth_dialog/doc/ja/teraterm.hhc
    branches/ssh_auth_dialog/installer/build.bat
    branches/ssh_auth_dialog/installer/check_sjis_code.pl
    branches/ssh_auth_dialog/installer/release/lang/English.lng
    branches/ssh_auth_dialog/installer/release/lang/French.lng
    branches/ssh_auth_dialog/installer/release/lang/German.lng
    branches/ssh_auth_dialog/installer/release/lang/Japanese.lng
    branches/ssh_auth_dialog/installer/release/lang/Korean.lng
    branches/ssh_auth_dialog/installer/release/lang/Russian.lng
    branches/ssh_auth_dialog/installer/release/lang/Simplified Chinese.lng
    branches/ssh_auth_dialog/installer/release/lang/Traditional Chinese.lng
    branches/ssh_auth_dialog/installer/teraterm.iss
    branches/ssh_auth_dialog/libs/SFMT.cmake
    branches/ssh_auth_dialog/libs/build_library_with_cmake.md
    branches/ssh_auth_dialog/libs/buildall.cmake
    branches/ssh_auth_dialog/libs/buildall_cmake.bat
    branches/ssh_auth_dialog/libs/oniguruma.cmake
    branches/ssh_auth_dialog/libs/openssl.cmake
    branches/ssh_auth_dialog/libs/script_support.cmake
    branches/ssh_auth_dialog/libs/zlib.cmake
    branches/ssh_auth_dialog/teraterm/CMakeLists.txt
    branches/ssh_auth_dialog/teraterm/common/compat_win.h
    branches/ssh_auth_dialog/teraterm/common/dlglib.c
    branches/ssh_auth_dialog/teraterm/common/dlglib.h
    branches/ssh_auth_dialog/teraterm/common/dlglib_cpp.cpp
    branches/ssh_auth_dialog/teraterm/common/dlglib_tmpl.cpp
    branches/ssh_auth_dialog/teraterm/common/dllutil.cpp
    branches/ssh_auth_dialog/teraterm/common/i18n.c
    branches/ssh_auth_dialog/teraterm/common/i18n.h
    branches/ssh_auth_dialog/teraterm/common/servicenames.h
    branches/ssh_auth_dialog/teraterm/common/tipwin.cpp
    branches/ssh_auth_dialog/teraterm/common/tt_res.h
    branches/ssh_auth_dialog/teraterm/common/ttcommon.h
    branches/ssh_auth_dialog/teraterm/common/ttftypes.h
    branches/ssh_auth_dialog/teraterm/common/ttlib.c
    branches/ssh_auth_dialog/teraterm/common/ttlib.h
    branches/ssh_auth_dialog/teraterm/common/tttypes.h
    branches/ssh_auth_dialog/teraterm/keycode/keycode.rc
    branches/ssh_auth_dialog/teraterm/keycode/keycode.vcproj
    branches/ssh_auth_dialog/teraterm/teraterm/CMakeLists.txt
    branches/ssh_auth_dialog/teraterm/teraterm/addsetting.cpp
    branches/ssh_auth_dialog/teraterm/teraterm/addsetting.h
    branches/ssh_auth_dialog/teraterm/teraterm/dnddlg.cpp
    branches/ssh_auth_dialog/teraterm/teraterm/filesys.cpp
    branches/ssh_auth_dialog/teraterm/teraterm/ftdlg.cpp
    branches/ssh_auth_dialog/teraterm/teraterm/ftdlg.h
    branches/ssh_auth_dialog/teraterm/teraterm/protodlg.cpp
    branches/ssh_auth_dialog/teraterm/teraterm/protodlg.h
    branches/ssh_auth_dialog/teraterm/teraterm/tekwin.cpp
    branches/ssh_auth_dialog/teraterm/teraterm/tekwin.h
    branches/ssh_auth_dialog/teraterm/teraterm/teraprn.cpp
    branches/ssh_auth_dialog/teraterm/teraterm/teraterm.cpp
    branches/ssh_auth_dialog/teraterm/teraterm/ttdialog.c
    branches/ssh_auth_dialog/teraterm/teraterm/ttermpro.rc
    branches/ssh_auth_dialog/teraterm/teraterm/ttermpro.v10.vcxproj
    branches/ssh_auth_dialog/teraterm/teraterm/ttermpro.v11.vcxproj
    branches/ssh_auth_dialog/teraterm/teraterm/ttermpro.v12.vcxproj
    branches/ssh_auth_dialog/teraterm/teraterm/ttermpro.v14.vcxproj
    branches/ssh_auth_dialog/teraterm/teraterm/ttermpro.v15.vcxproj
    branches/ssh_auth_dialog/teraterm/teraterm/ttermpro.v15.vcxproj.filters
    branches/ssh_auth_dialog/teraterm/teraterm/ttermpro.v9.vcproj
    branches/ssh_auth_dialog/teraterm/teraterm/ttermpro.vcproj
    branches/ssh_auth_dialog/teraterm/teraterm/ttplug.c
    branches/ssh_auth_dialog/teraterm/teraterm/vtdisp.c
    branches/ssh_auth_dialog/teraterm/teraterm/vtdisp.h
    branches/ssh_auth_dialog/teraterm/teraterm/vtwin.cpp
    branches/ssh_auth_dialog/teraterm/teraterm/vtwin.h
    branches/ssh_auth_dialog/teraterm/teraterm/winjump.c
    branches/ssh_auth_dialog/teraterm/ttermpro.sln
    branches/ssh_auth_dialog/teraterm/ttermpro.v10.sln
    branches/ssh_auth_dialog/teraterm/ttermpro.v11.sln
    branches/ssh_auth_dialog/teraterm/ttermpro.v12.sln
    branches/ssh_auth_dialog/teraterm/ttermpro.v14.sln
    branches/ssh_auth_dialog/teraterm/ttermpro.v15.sln
    branches/ssh_auth_dialog/teraterm/ttermpro.v9.sln
    branches/ssh_auth_dialog/teraterm/ttpcmn/CMakeLists.txt
    branches/ssh_auth_dialog/teraterm/ttpcmn/language.c
    branches/ssh_auth_dialog/teraterm/ttpcmn/language.h
    branches/ssh_auth_dialog/teraterm/ttpcmn/ttcmn.c
    branches/ssh_auth_dialog/teraterm/ttpcmn/ttpcmn-version.rc
    branches/ssh_auth_dialog/teraterm/ttpcmn/ttpcmn.def
    branches/ssh_auth_dialog/teraterm/ttpcmn/ttpcmn.v10.vcxproj
    branches/ssh_auth_dialog/teraterm/ttpcmn/ttpcmn.v10.vcxproj.filters
    branches/ssh_auth_dialog/teraterm/ttpcmn/ttpcmn.v11.vcxproj
    branches/ssh_auth_dialog/teraterm/ttpcmn/ttpcmn.v11.vcxproj.filters
    branches/ssh_auth_dialog/teraterm/ttpcmn/ttpcmn.v12.vcxproj
    branches/ssh_auth_dialog/teraterm/ttpcmn/ttpcmn.v12.vcxproj.filters
    branches/ssh_auth_dialog/teraterm/ttpcmn/ttpcmn.v14.vcxproj
    branches/ssh_auth_dialog/teraterm/ttpcmn/ttpcmn.v14.vcxproj.filters
    branches/ssh_auth_dialog/teraterm/ttpcmn/ttpcmn.v15.vcxproj
    branches/ssh_auth_dialog/teraterm/ttpcmn/ttpcmn.v15.vcxproj.filters
    branches/ssh_auth_dialog/teraterm/ttpcmn/ttpcmn.v9.vcproj
    branches/ssh_auth_dialog/teraterm/ttpcmn/ttpcmn.vcproj
    branches/ssh_auth_dialog/teraterm/ttpdlg/ttdlg.c
    branches/ssh_auth_dialog/teraterm/ttpdlg/ttpdlg.rc
    branches/ssh_auth_dialog/teraterm/ttpfile/quickvan.c
    branches/ssh_auth_dialog/teraterm/ttpfile/ttfile.c
    branches/ssh_auth_dialog/teraterm/ttpfile/ttpfile.v10.vcxproj
    branches/ssh_auth_dialog/teraterm/ttpfile/ttpfile.v11.vcxproj
    branches/ssh_auth_dialog/teraterm/ttpfile/ttpfile.v12.vcxproj
    branches/ssh_auth_dialog/teraterm/ttpfile/ttpfile.v14.vcxproj
    branches/ssh_auth_dialog/teraterm/ttpfile/ttpfile.v15.vcxproj
    branches/ssh_auth_dialog/teraterm/ttpfile/ttpfile.v15.vcxproj.filters
    branches/ssh_auth_dialog/teraterm/ttpfile/ttpfile.vcproj
    branches/ssh_auth_dialog/teraterm/ttpmacro/CMakeLists.txt
    branches/ssh_auth_dialog/teraterm/ttpmacro/ListDlg.cpp
    branches/ssh_auth_dialog/teraterm/ttpmacro/ListDlg.h
    branches/ssh_auth_dialog/teraterm/ttpmacro/errdlg.cpp
    branches/ssh_auth_dialog/teraterm/ttpmacro/errdlg.h
    branches/ssh_auth_dialog/teraterm/ttpmacro/inpdlg.cpp
    branches/ssh_auth_dialog/teraterm/ttpmacro/inpdlg.h
    branches/ssh_auth_dialog/teraterm/ttpmacro/msgdlg.cpp
    branches/ssh_auth_dialog/teraterm/ttpmacro/msgdlg.h
    branches/ssh_auth_dialog/teraterm/ttpmacro/statdlg.cpp
    branches/ssh_auth_dialog/teraterm/ttpmacro/statdlg.h
    branches/ssh_auth_dialog/teraterm/ttpmacro/ttl.c
    branches/ssh_auth_dialog/teraterm/ttpmacro/ttm_res.h
    branches/ssh_auth_dialog/teraterm/ttpmacro/ttmacro.cpp
    branches/ssh_auth_dialog/teraterm/ttpmacro/ttmacro.h
    branches/ssh_auth_dialog/teraterm/ttpmacro/ttmdlg.cpp
    branches/ssh_auth_dialog/teraterm/ttpmacro/ttmlib.c
    branches/ssh_auth_dialog/teraterm/ttpmacro/ttmlib.h
    branches/ssh_auth_dialog/teraterm/ttpmacro/ttmmain.cpp
    branches/ssh_auth_dialog/teraterm/ttpmacro/ttmmain.h
    branches/ssh_auth_dialog/teraterm/ttpmacro/ttmparse.c
    branches/ssh_auth_dialog/teraterm/ttpmacro/ttpmacro.rc
    branches/ssh_auth_dialog/teraterm/ttpmacro/ttpmacro.v10.vcxproj
    branches/ssh_auth_dialog/teraterm/ttpmacro/ttpmacro.v11.vcxproj
    branches/ssh_auth_dialog/teraterm/ttpmacro/ttpmacro.v12.vcxproj
    branches/ssh_auth_dialog/teraterm/ttpmacro/ttpmacro.v14.vcxproj
    branches/ssh_auth_dialog/teraterm/ttpmacro/ttpmacro.v15.vcxproj
    branches/ssh_auth_dialog/teraterm/ttpmacro/ttpmacro.v15.vcxproj.filters
    branches/ssh_auth_dialog/teraterm/ttpmacro/ttpmacro.v9.vcproj
    branches/ssh_auth_dialog/teraterm/ttpmacro/ttpmacro.vcproj
    branches/ssh_auth_dialog/teraterm/ttpset/ttpset-version.rc
    branches/ssh_auth_dialog/teraterm/ttpset/ttpset.v10.vcxproj
    branches/ssh_auth_dialog/teraterm/ttpset/ttpset.v10.vcxproj.filters
    branches/ssh_auth_dialog/teraterm/ttpset/ttpset.v11.vcxproj
    branches/ssh_auth_dialog/teraterm/ttpset/ttpset.v11.vcxproj.filters
    branches/ssh_auth_dialog/teraterm/ttpset/ttpset.v12.vcxproj
    branches/ssh_auth_dialog/teraterm/ttpset/ttpset.v12.vcxproj.filters
    branches/ssh_auth_dialog/teraterm/ttpset/ttpset.v14.vcxproj
    branches/ssh_auth_dialog/teraterm/ttpset/ttpset.v14.vcxproj.filters
    branches/ssh_auth_dialog/teraterm/ttpset/ttpset.v15.vcxproj
    branches/ssh_auth_dialog/teraterm/ttpset/ttpset.v15.vcxproj.filters
    branches/ssh_auth_dialog/teraterm/ttpset/ttpset.v9.vcproj
    branches/ssh_auth_dialog/teraterm/ttpset/ttpset.vcproj
    branches/ssh_auth_dialog/teraterm/ttptek/CMakeLists.txt
    branches/ssh_auth_dialog/teraterm/ttptek/ttptek-version.rc
    branches/ssh_auth_dialog/teraterm/ttptek/ttptek.v10.vcxproj
    branches/ssh_auth_dialog/teraterm/ttptek/ttptek.v10.vcxproj.filters
    branches/ssh_auth_dialog/teraterm/ttptek/ttptek.v11.vcxproj
    branches/ssh_auth_dialog/teraterm/ttptek/ttptek.v11.vcxproj.filters
    branches/ssh_auth_dialog/teraterm/ttptek/ttptek.v12.vcxproj
    branches/ssh_auth_dialog/teraterm/ttptek/ttptek.v12.vcxproj.filters
    branches/ssh_auth_dialog/teraterm/ttptek/ttptek.v14.vcxproj
    branches/ssh_auth_dialog/teraterm/ttptek/ttptek.v14.vcxproj.filters
    branches/ssh_auth_dialog/teraterm/ttptek/ttptek.v15.vcxproj
    branches/ssh_auth_dialog/teraterm/ttptek/ttptek.v15.vcxproj.filters
    branches/ssh_auth_dialog/teraterm/ttptek/ttptek.v9.vcproj
    branches/ssh_auth_dialog/teraterm/ttptek/ttptek.vcproj
    branches/ssh_auth_dialog/ttpmenu/ttpmenu.rc
    branches/ssh_auth_dialog/ttpmenu/ttpmenu.v10.vcxproj
    branches/ssh_auth_dialog/ttpmenu/ttpmenu.v11.vcxproj
    branches/ssh_auth_dialog/ttpmenu/ttpmenu.v12.vcxproj
    branches/ssh_auth_dialog/ttpmenu/ttpmenu.v14.vcxproj
    branches/ssh_auth_dialog/ttpmenu/ttpmenu.v15.vcxproj
    branches/ssh_auth_dialog/ttpmenu/ttpmenu.v9.vcproj
    branches/ssh_auth_dialog/ttpmenu/ttpmenu.vcproj
    branches/ssh_auth_dialog/ttssh2/putty/CMakeLists.txt
    branches/ssh_auth_dialog/ttssh2/ttssh/ttssh.rc
    branches/ssh_auth_dialog/ttssh2/ttxssh/CMakeLists.txt
    branches/ssh_auth_dialog/ttssh2/ttxssh/auth.c
    branches/ssh_auth_dialog/ttssh2/ttxssh/auth.h
    branches/ssh_auth_dialog/ttssh2/ttxssh/buffer.c
    branches/ssh_auth_dialog/ttssh2/ttxssh/fwd-socks.c
    branches/ssh_auth_dialog/ttssh2/ttxssh/fwd.c
    branches/ssh_auth_dialog/ttssh2/ttxssh/fwdui.c
    branches/ssh_auth_dialog/ttssh2/ttxssh/hosts.c
    branches/ssh_auth_dialog/ttssh2/ttxssh/key.c
    branches/ssh_auth_dialog/ttssh2/ttxssh/key.h
    branches/ssh_auth_dialog/ttssh2/ttxssh/keyfiles.c
    branches/ssh_auth_dialog/ttssh2/ttxssh/sftp.c
    branches/ssh_auth_dialog/ttssh2/ttxssh/ssh.c
    branches/ssh_auth_dialog/ttssh2/ttxssh/ttxssh.c
    branches/ssh_auth_dialog/ttssh2/ttxssh/ttxssh.rc
    branches/ssh_auth_dialog/ttssh2/ttxssh/ttxssh.v10.vcxproj
    branches/ssh_auth_dialog/ttssh2/ttxssh/ttxssh.v11.vcxproj
    branches/ssh_auth_dialog/ttssh2/ttxssh/ttxssh.v12.vcxproj
    branches/ssh_auth_dialog/ttssh2/ttxssh/ttxssh.v14.vcxproj
    branches/ssh_auth_dialog/ttssh2/ttxssh/ttxssh.v15.vcxproj
    branches/ssh_auth_dialog/ttssh2/ttxssh/ttxssh.v15.vcxproj.filters
    branches/ssh_auth_dialog/ttssh2/ttxssh/ttxssh.v9.vcproj
    branches/ssh_auth_dialog/ttssh2/ttxssh/ttxssh.vcproj
    branches/ssh_auth_dialog/ttssh2/ttxssh/util.c
    branches/ssh_auth_dialog/version_info.h.in

Added Paths:
-----------
    branches/ssh_auth_dialog/TTProxy/TTProxy.v16.sln
    branches/ssh_auth_dialog/TTProxy/TTProxy.v16.vcxproj
    branches/ssh_auth_dialog/TTProxy/TTProxy.v16.vcxproj.filters
    branches/ssh_auth_dialog/TTXKanjiMenu/ttxkanjimenu.v16.sln
    branches/ssh_auth_dialog/TTXKanjiMenu/ttxkanjimenu.v16.vcxproj
    branches/ssh_auth_dialog/TTXKanjiMenu/ttxkanjimenu.v16.vcxproj.filters
    branches/ssh_auth_dialog/TTXSamples/TTXAdditionalTitle/TTXAdditionalTitle.v16.vcxproj
    branches/ssh_auth_dialog/TTXSamples/TTXAdditionalTitle/TTXAdditionalTitle.v16.vcxproj.filters
    branches/ssh_auth_dialog/TTXSamples/TTXAlwaysOnTop/TTXAlwaysOnTop.v16.vcxproj
    branches/ssh_auth_dialog/TTXSamples/TTXAlwaysOnTop/TTXAlwaysOnTop.v16.vcxproj.filters
    branches/ssh_auth_dialog/TTXSamples/TTXCallSysMenu/TTXCallSysMenu.v16.vcxproj
    branches/ssh_auth_dialog/TTXSamples/TTXCallSysMenu/TTXCallSysMenu.v16.vcxproj.filters
    branches/ssh_auth_dialog/TTXSamples/TTXCommandLineOpt/TTXCommandLineOpt.v16.vcxproj
    branches/ssh_auth_dialog/TTXSamples/TTXCommandLineOpt/TTXCommandLineOpt.v16.vcxproj.filters
    branches/ssh_auth_dialog/TTXSamples/TTXCopyIniFile/TTXCopyIniFile.v16.vcxproj
    branches/ssh_auth_dialog/TTXSamples/TTXCopyIniFile/TTXCopyIniFile.v16.vcxproj.filters
    branches/ssh_auth_dialog/TTXSamples/TTXFixedWinSize/TTXFixedWinSize.v16.vcxproj
    branches/ssh_auth_dialog/TTXSamples/TTXFixedWinSize/TTXFixedWinSize.v16.vcxproj.filters
    branches/ssh_auth_dialog/TTXSamples/TTXKcodeChange/TTXKcodeChange.v16.vcxproj
    branches/ssh_auth_dialog/TTXSamples/TTXKcodeChange/TTXKcodeChange.v16.vcxproj.filters
    branches/ssh_auth_dialog/TTXSamples/TTXOutputBuffering/TTXOutputBuffering.v16.vcxproj
    branches/ssh_auth_dialog/TTXSamples/TTXOutputBuffering/TTXOutputBuffering.v16.vcxproj.filters
    branches/ssh_auth_dialog/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.v16.vcxproj
    branches/ssh_auth_dialog/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.v16.vcxproj.filters
    branches/ssh_auth_dialog/TTXSamples/TTXResizeMenu/TTXResizeMenu.v16.vcxproj
    branches/ssh_auth_dialog/TTXSamples/TTXResizeMenu/TTXResizeMenu.v16.vcxproj.filters
    branches/ssh_auth_dialog/TTXSamples/TTXResizeWin/TTXResizeWin.v16.vcxproj
    branches/ssh_auth_dialog/TTXSamples/TTXResizeWin/TTXResizeWin.v16.vcxproj.filters
    branches/ssh_auth_dialog/TTXSamples/TTXSamples.v16.sln
    branches/ssh_auth_dialog/TTXSamples/TTXShowCommandLine/TTXShowCommandLine.v16.vcxproj
    branches/ssh_auth_dialog/TTXSamples/TTXShowCommandLine/TTXShowCommandLine.v16.vcxproj.filters
    branches/ssh_auth_dialog/TTXSamples/TTXViewMode/TTXViewMode.v16.vcxproj
    branches/ssh_auth_dialog/TTXSamples/TTXViewMode/TTXViewMode.v16.vcxproj.filters
    branches/ssh_auth_dialog/TTXSamples/TTXttyrec/TTXttyplay.v16.vcxproj
    branches/ssh_auth_dialog/TTXSamples/TTXttyrec/TTXttyplay.v16.vcxproj.filters
    branches/ssh_auth_dialog/TTXSamples/TTXttyrec/TTXttyrec.v16.vcxproj
    branches/ssh_auth_dialog/TTXSamples/TTXttyrec/TTXttyrec.v16.vcxproj.filters
    branches/ssh_auth_dialog/TTXSamples/ttxtest/TTXtest.v16.vcxproj
    branches/ssh_auth_dialog/TTXSamples/ttxtest/TTXtest.v16.vcxproj.filters
    branches/ssh_auth_dialog/doc/en/html/reference/build_library_with_cmake.md
    branches/ssh_auth_dialog/doc/en/html/reference/build_with_cmake.md
    branches/ssh_auth_dialog/doc/ja/html/reference/build_library_with_cmake.md
    branches/ssh_auth_dialog/teraterm/common/teraterm_conf.h
    branches/ssh_auth_dialog/teraterm/common/tmfc.cpp
    branches/ssh_auth_dialog/teraterm/common/tmfc.h
    branches/ssh_auth_dialog/teraterm/common/tmfc_frame.cpp
    branches/ssh_auth_dialog/teraterm/keycode/keycode.v16.vcxproj
    branches/ssh_auth_dialog/teraterm/keycode/keycode.v16.vcxproj.filters
    branches/ssh_auth_dialog/teraterm/svnrev/svnrev.v16.vcxproj
    branches/ssh_auth_dialog/teraterm/svnrev/svnrev.v16.vcxproj.filters
    branches/ssh_auth_dialog/teraterm/teraterm/svnversion.h.in
    branches/ssh_auth_dialog/teraterm/teraterm/teraterml.h
    branches/ssh_auth_dialog/teraterm/teraterm/ttermpro.v16.vcxproj
    branches/ssh_auth_dialog/teraterm/teraterm/ttermpro.v16.vcxproj.filters
    branches/ssh_auth_dialog/teraterm/ttermpro.v16.sln
    branches/ssh_auth_dialog/teraterm/ttpcmn/ttpcmn.v16.vcxproj
    branches/ssh_auth_dialog/teraterm/ttpcmn/ttpcmn.v16.vcxproj.filters
    branches/ssh_auth_dialog/teraterm/ttpdlg/ttdlg.h
    branches/ssh_auth_dialog/teraterm/ttpfile/ttpfile.v16.vcxproj
    branches/ssh_auth_dialog/teraterm/ttpfile/ttpfile.v16.vcxproj.filters
    branches/ssh_auth_dialog/teraterm/ttpmacro/ttpmacro.v16.vcxproj
    branches/ssh_auth_dialog/teraterm/ttpmacro/ttpmacro.v16.vcxproj.filters
    branches/ssh_auth_dialog/teraterm/ttpset/ttpset.v16.vcxproj
    branches/ssh_auth_dialog/teraterm/ttpset/ttpset.v16.vcxproj.filters
    branches/ssh_auth_dialog/teraterm/ttptek/ttptek.v16.vcxproj
    branches/ssh_auth_dialog/teraterm/ttptek/ttptek.v16.vcxproj.filters
    branches/ssh_auth_dialog/tests/gui_commands_test.ttl
    branches/ssh_auth_dialog/tests/gui_commands_test_utf8.ttl
    branches/ssh_auth_dialog/ttpmenu/ttpmenu.v16.sln
    branches/ssh_auth_dialog/ttpmenu/ttpmenu.v16.vcxproj
    branches/ssh_auth_dialog/ttssh2/matcher/matcher.v16.vcxproj
    branches/ssh_auth_dialog/ttssh2/putty/putty.v16.vcxproj
    branches/ssh_auth_dialog/ttssh2/putty/putty.v16.vcxproj.filters
    branches/ssh_auth_dialog/ttssh2/puttyrev/puttyrev.v16.vcxproj
    branches/ssh_auth_dialog/ttssh2/puttyrev/puttyrev.v16.vcxproj.filters
    branches/ssh_auth_dialog/ttssh2/ttssh/ttssh.v16.vcxproj
    branches/ssh_auth_dialog/ttssh2/ttssh.v16.sln
    branches/ssh_auth_dialog/ttssh2/ttxssh/ttxssh.v16.vcxproj
    branches/ssh_auth_dialog/ttssh2/ttxssh/ttxssh.v16.vcxproj.filters

Removed Paths:
-------------
    branches/ssh_auth_dialog/TTProxy/TTProxy.dsp
    branches/ssh_auth_dialog/TTProxy/TTProxy.dsw
    branches/ssh_auth_dialog/teraterm/common/stdafx.cpp
    branches/ssh_auth_dialog/teraterm/common/stdafx.h
    branches/ssh_auth_dialog/teraterm/svnrev/CMakeLists.txt
    branches/ssh_auth_dialog/teraterm/teraterm/teraapp.h
    branches/ssh_auth_dialog/teraterm/ttpcmn/cmn_res.h
    branches/ssh_auth_dialog/teraterm/ttpcmn/ttpcmn.dsp
    branches/ssh_auth_dialog/teraterm/ttpcmn/ttpcmn.rc
    branches/ssh_auth_dialog/teraterm/ttpdlg/CMakeLists.txt
    branches/ssh_auth_dialog/teraterm/ttpdlg/svnversion.h.in
    branches/ssh_auth_dialog/teraterm/ttpdlg/ttpdlg-version.rc
    branches/ssh_auth_dialog/teraterm/ttpdlg/ttpdlg.def
    branches/ssh_auth_dialog/teraterm/ttpdlg/ttpdlg.dsp
    branches/ssh_auth_dialog/teraterm/ttpdlg/ttpdlg.v10.vcxproj
    branches/ssh_auth_dialog/teraterm/ttpdlg/ttpdlg.v10.vcxproj.filters
    branches/ssh_auth_dialog/teraterm/ttpdlg/ttpdlg.v11.vcxproj
    branches/ssh_auth_dialog/teraterm/ttpdlg/ttpdlg.v11.vcxproj.filters
    branches/ssh_auth_dialog/teraterm/ttpdlg/ttpdlg.v12.vcxproj
    branches/ssh_auth_dialog/teraterm/ttpdlg/ttpdlg.v12.vcxproj.filters
    branches/ssh_auth_dialog/teraterm/ttpdlg/ttpdlg.v14.vcxproj
    branches/ssh_auth_dialog/teraterm/ttpdlg/ttpdlg.v14.vcxproj.filters
    branches/ssh_auth_dialog/teraterm/ttpdlg/ttpdlg.v15.vcxproj
    branches/ssh_auth_dialog/teraterm/ttpdlg/ttpdlg.v15.vcxproj.filters
    branches/ssh_auth_dialog/teraterm/ttpdlg/ttpdlg.v9.vcproj
    branches/ssh_auth_dialog/teraterm/ttpdlg/ttpdlg.vcproj
    branches/ssh_auth_dialog/teraterm/ttpfile/ttpfile.dsp
    branches/ssh_auth_dialog/teraterm/ttpmacro/stdafx.h
    branches/ssh_auth_dialog/teraterm/ttpmacro/ttpmacro.dsp
    branches/ssh_auth_dialog/teraterm/ttpset/set_res.h
    branches/ssh_auth_dialog/teraterm/ttpset/ttpset.dsp
    branches/ssh_auth_dialog/teraterm/ttpset/ttpset.rc
    branches/ssh_auth_dialog/teraterm/ttptek/tek_res.h
    branches/ssh_auth_dialog/teraterm/ttptek/ttptek.dsp
    branches/ssh_auth_dialog/teraterm/ttptek/ttptek.rc
    branches/ssh_auth_dialog/ttpmenu/ttpmenu.dsp
    branches/ssh_auth_dialog/ttpmenu/ttpmenu.dsw
    branches/ssh_auth_dialog/ttssh2/matcher/matcher.dsp
    branches/ssh_auth_dialog/ttssh2/ttssh/ttssh.dsp
    branches/ssh_auth_dialog/ttssh2/ttssh.dsw
    branches/ssh_auth_dialog/ttssh2/ttssh.opt
    branches/ssh_auth_dialog/ttssh2/ttxssh/ttxssh.dsp

-------------- next part --------------
Modified: branches/ssh_auth_dialog/CMakeLists.txt
===================================================================

--- branches/ssh_auth_dialog/CMakeLists.txt	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/CMakeLists.txt	2019-04-24 14:08:16 UTC (rev 7613)
@@ -3,7 +3,6 @@
 
 project(teraterm_all)
 
-option(ENABLE_DPIAWARENESS "Dpiawareness" ON)
 option(ENABLE_TTXSAMPLES "TTXSamples" ON)
 option(USE_UNICODE_API "unicode" OFF)
 
@@ -17,6 +16,9 @@
 set(_WIN32_WINNT "0x0a00")
 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})
@@ -29,7 +31,8 @@
   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")
@@ -38,10 +41,8 @@
 elseif(MINGW)
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_WIN32_WINNT=${_WIN32_WINNT}")
   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_WIN32_WINNT=${_WIN32_WINNT}")
-  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra "
-    "-Wno-unused-parameter -static -ffunction-sections -fdata-sections ${C_ONLY_FLAGS}")
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra "
-    "-Wno-unused-parameter -static -ffunction-sections -fdata-sections")
+  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Wno-unused-parameter -static -ffunction-sections -fdata-sections ${C_ONLY_FLAGS}")
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Wno-unused-parameter -static -ffunction-sections -fdata-sections")
   if (CMAKE_C_COMPILER_ID STREQUAL "GNU")
     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -static-libgcc -static-libstdc++")
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -static-libgcc -static-libstdc++")
@@ -57,8 +58,14 @@
   if(Git_FOUND)
     execute_process(
       COMMAND ${GIT_EXECUTABLE} svn log --oneline -1
-      OUTPUT_VARIABLE ov)
-    string(REGEX MATCH "[0-9]+" SVNVERSION ${ov})
+      RESULT_VARIABLE rv
+      OUTPUT_VARIABLE ov
+      ERROR_QUIET)
+    if(${rv})
+      message("git svn error? please check git svn")
+    else()
+      string(REGEX MATCH "[0-9]+" SVNVERSION ${ov})
+    endif()
   endif()
 elseif(EXISTS "${CMAKE_SOURCE_DIR}/.svn")
   # svn
@@ -86,3 +93,17 @@
 if(${ENABLE_TTXSAMPLES})
   add_subdirectory(TTXSamples)
 endif()
+
+####
+# ソースツリー内に生成ファイルが存在していたら削除する
+if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/teraterm/ttpdlg/svnversion.h")
+  # r7517より前
+  file(REMOVE "${CMAKE_CURRENT_SOURCE_DIR}/teraterm/ttpdlg/svnversion.h")
+endif()
+if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/teraterm/teraterm/svnversion.h")
+  # r7517以後
+  file(REMOVE "${CMAKE_CURRENT_SOURCE_DIR}/teraterm/teraterm/svnversion.h")
+endif()
+if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/ttssh2/ttxssh/puttyversion.h")
+  file(REMOVE "${CMAKE_CURRENT_SOURCE_DIR}/ttssh2/ttxssh/puttyversion.h")
+endif()

Modified: branches/ssh_auth_dialog/TTProxy/ProxyWSockHook.h
===================================================================
--- branches/ssh_auth_dialog/TTProxy/ProxyWSockHook.h	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/TTProxy/ProxyWSockHook.h	2019-04-24 14:08:16 UTC (rev 7613)
@@ -20,7 +20,7 @@
 
 extern char UILanguageFile[MAX_PATH];
 
-void UTIL_get_lang_msg(PCHAR key, PCHAR buf, int buf_len, PCHAR def)
+void UTIL_get_lang_msg(const char *key, PCHAR buf, int buf_len, const char *def)
 {
     GetI18nStr("TTProxy", key, buf, buf_len, def, UILanguageFile);
 }
@@ -44,7 +44,7 @@
 public:
     class MessageShower {
     public:
-        virtual void showMessage(const char* message)const = NULL;
+        virtual void showMessage(const char* message)const = 0;
     };
 private:
     struct DUMMYHOSTENT {
@@ -730,7 +730,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)) {
@@ -765,11 +765,12 @@
         }
         virtual bool onInitDialog() {
             char uimsg[MAX_UIMSG], uitmp[MAX_UIMSG];
-            LOGFONT logfont;
-            HFONT font;
+//          LOGFONT logfont;
+//          HFONT font;
 
             Dialog::onInitDialog();
 
+#if 0
             font = (HFONT)SendMessage(WM_GETFONT, 0, 0);
             GetObject(font, sizeof(LOGFONT), &logfont);
             if (UTIL_get_lang_font("DLG_TAHOMA_FONT", HWND(), &logfont, &DlgFont)) {
@@ -800,6 +801,7 @@
             else {
                 DlgFont = NULL;
             }
+#endif
 
             GetWindowText(uitmp, sizeof(uitmp));
             UTIL_get_lang_msg("DLG_OTHER_TITLE", uimsg, sizeof(uimsg), uitmp);
@@ -877,6 +879,8 @@
             if (logfile != NULL)
                 log.SetWindowText(logfile);
 
+            CenterWindow((HWND)*this, GetParent());
+
             return true;
         }
         virtual void onOK() {
@@ -904,15 +908,19 @@
 
             logfile = log.GetWindowTextLength() > 0 ? log.GetWindowText() : NULL;
 
+#if 0
             if (DlgFont != NULL) {
                 DeleteObject(DlgFont);
             }
+#endif
             Dialog::onOK();
         }
         virtual void onCancel() {
+#if 0
             if (DlgFont != NULL) {
                 DeleteObject(DlgFont);
             }
+#endif
             Dialog::onCancel();
         }
     public:
@@ -941,7 +949,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) {
@@ -963,11 +971,12 @@
         }
         virtual bool onInitDialog() {
             char uimsg[MAX_UIMSG], uitmp[MAX_UIMSG];
-            LOGFONT logfont;
-            HFONT font;
+//          LOGFONT logfont;
+//          HFONT font;
 
             Dialog::onInitDialog();
 
+#if 0
             font = (HFONT)SendMessage(WM_GETFONT, 0, 0);
             GetObject(font, sizeof(LOGFONT), &logfont);
             if (UTIL_get_lang_font("DLG_TAHOMA_FONT", HWND(), &logfont, &DlgFont)) {
@@ -990,6 +999,7 @@
             else {
                 DlgFont = NULL;
             }
+#endif
 
             GetWindowText(uitmp, sizeof(uitmp));
             UTIL_get_lang_msg("DLG_SETUP_TITLE", uimsg, sizeof(uimsg), uitmp);
@@ -1063,6 +1073,7 @@
             }
             lock = false;
             onChanged(0);
+            CenterWindow((HWND)*this, GetParent());
             return true;
         }
         virtual void onOK() {
@@ -1081,15 +1092,19 @@
                     return;
                 }
             }
+#if 0
             if (DlgFont != NULL) {
                 DeleteObject(DlgFont);
             }
+#endif
             Dialog::onOK();
         }
         virtual void onCancel() {
+#if 0
             if (DlgFont != NULL) {
                 DeleteObject(DlgFont);
             }
+#endif
             Dialog::onCancel();
         }
         void onOptions() {
@@ -1194,7 +1209,7 @@
 
     class AboutDialog : public Dialog {
     private:
-        HFONT DlgFont;
+//      HFONT DlgFont;
         virtual bool onInitDialog() {
             String buf;
             char *buf2;
@@ -1201,9 +1216,10 @@
             const char *ver;
             int n, a, b, c, d, len;
             char uimsg[MAX_UIMSG], uimsg2[MAX_UIMSG], uimsg3[MAX_UIMSG];
-            LOGFONT logfont;
-            HFONT font;
+//          LOGFONT logfont;
+//          HFONT font;
 
+#if 0
             font = (HFONT)SendMessage(WM_GETFONT, 0, 0);
             GetObject(font, sizeof(LOGFONT), &logfont);
             if (UTIL_get_lang_font("DLG_TAHOMA_FONT", HWND(), &logfont, &DlgFont)) {
@@ -1213,6 +1229,7 @@
             else {
                 DlgFont = NULL;
             }
+#endif
 
             GetWindowText(uimsg2, sizeof(uimsg2));
             UTIL_get_lang_msg("DLG_ABOUT_TITLE", uimsg, sizeof(uimsg), uimsg2);
@@ -1241,12 +1258,16 @@
             UTIL_get_lang_msg("BTN_OK", uimsg, sizeof(uimsg),"OK");
             SetDlgItemText(IDOK, uimsg);
 
+            CenterWindow((HWND)*this, GetParent());
+
             return true;
         }
         virtual void onOK() {
+#if 0
             if (DlgFont != NULL) {
                 DeleteObject(DlgFont);
             }
+#endif
             Dialog::onOK();
         }
     public :
@@ -1389,9 +1410,9 @@
         static const char base64_table[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
         char buf[1024];
         int status_code;
-        if (sendToSocketFormat(s, strchr(realhost,':')?"CONNECT [%s]:%d HTTP/1.1\r\n":"CONNECT %s:%d HTTP/1.1\r\n", realhost, realport) == SOCKET_ERROR)
+        if (sendToSocketFormat(s, strchr((const char *)realhost,':')?"CONNECT [%s]:%d HTTP/1.1\r\n":"CONNECT %s:%d HTTP/1.1\r\n", (const char *)realhost, realport) == SOCKET_ERROR)
             return SOCKET_ERROR;
-        if (sendToSocketFormat(s, strchr(realhost,':')?"Host: [%s]:%d\r\n":"Host: %s:%d\r\n", realhost, realport) == SOCKET_ERROR)
+        if (sendToSocketFormat(s, strchr((const char *)realhost,':')?"Host: [%s]:%d\r\n":"Host: %s:%d\r\n", (const char *)realhost, realport) == SOCKET_ERROR)
             return SOCKET_ERROR;
         if (proxy.user != NULL) {
             int userlen = strlen(proxy.user);
@@ -1732,15 +1753,15 @@
         while (!err) {
             switch (wait_for_prompt(s, prompt_table, countof(prompt_table), 10)) {
             case 0: /* Hostname prompt */
-                if (sendToSocketFormat(s, strchr(realhost,':')?"[%s]:%d\n":"%s:%d\n", realhost, realport) == SOCKET_ERROR)
+                if (sendToSocketFormat(s, strchr((const char *)realhost,':')?"[%s]:%d\n":"%s:%d\n", (const char *)realhost, realport) == SOCKET_ERROR)
                     return SOCKET_ERROR;
                 break;
             case 1: /* Username prompt */
-                if (sendToSocketFormat(s, "%s\n", proxy.user) == SOCKET_ERROR)
+                if (sendToSocketFormat(s, "%s\n", (const char *)proxy.user) == SOCKET_ERROR)
                     return SOCKET_ERROR;
                 break;
             case 2: /* Password prompt */
-                if (sendToSocketFormat(s, "%s\n", proxy.pass) == SOCKET_ERROR)
+                if (sendToSocketFormat(s, "%s\n", (const char *)proxy.pass) == SOCKET_ERROR)
                     return SOCKET_ERROR;
                 break;
             case 3: /* Established message */

Modified: branches/ssh_auth_dialog/TTProxy/TTProxy.cpp
===================================================================
--- branches/ssh_auth_dialog/TTProxy/TTProxy.cpp	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/TTProxy/TTProxy.cpp	2019-04-24 14:08:16 UTC (rev 7613)
@@ -17,7 +17,8 @@
 	}
 }
 
-BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) {
+extern "C" __declspec(dllexport) BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) {
+	(void)reserved;
 	switch (reason) {
 	case DLL_PROCESS_ATTACH:
 		myInstance = instance;
@@ -28,6 +29,9 @@
 		return TTProxy::getInstance().threadAttach();
 	case DLL_THREAD_DETACH:
 		return TTProxy::getInstance().threadDetach();
+	default:
+		TTXBind(0, NULL);	// dummy TODO \x96\xA2\x8Eg\x97p\x82ō폜\x82\xB3\x82\xEA\x82Ȃ\xA2\x82悤\x82ɂ\xB7\x82\xE9
+		break;
 	}
 	return FALSE;
 }

Deleted: branches/ssh_auth_dialog/TTProxy/TTProxy.dsp
===================================================================
--- branches/ssh_auth_dialog/TTProxy/TTProxy.dsp	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/TTProxy/TTProxy.dsp	2019-04-24 14:08:16 UTC (rev 7613)
@@ -1,271 +0,0 @@
-# Microsoft Developer Studio Project File - Name="TTProxy" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** \x95ҏW\x82\xB5\x82Ȃ\xA2\x82ł\xAD\x82\xBE\x82\xB3\x82\xA2 **
-
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-
-CFG=TTProxy - Win32 Debug
-!MESSAGE \x82\xB1\x82\xEA\x82͗L\x8C\xF8\x82\xC8Ҳ\xB8̧\xB2قł͂\xA0\x82\xE8\x82܂\xB9\x82\xF1\x81B \x82\xB1\x82\xCC\xCC\xDFۼު\xB8Ă\xF0\xCB\xDE\xD9\xC4ނ\xB7\x82邽\x82߂ɂ\xCD NMAKE \x82\xF0\x8Eg\x97p\x82\xB5\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2\x81B
-!MESSAGE [Ҳ\xB8̧\xB2ق̴\xB8\xBD\xCE߰\xC4] \xBA\xCF\xDD\xC4ނ\xF0\x8Eg\x97p\x82\xB5\x82Ď\xC0\x8Ds\x82\xB5\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2
-!MESSAGE 
-!MESSAGE NMAKE /f "TTProxy.mak".
-!MESSAGE 
-!MESSAGE NMAKE \x82̎\xC0\x8Ds\x8E\x9E\x82ɍ\\x90\xAC\x82\xF0\x8Ew\x92\xE8\x82ł\xAB\x82܂\xB7
-!MESSAGE \xBA\xCF\xDD\xC4\xDE ײݏ\xE3\x82\xC5ϸۂ̐ݒ\xE8\x82\xF0\x92\xE8\x8B`\x82\xB5\x82܂\xB7\x81B\x97\xE1:
-!MESSAGE 
-!MESSAGE NMAKE /f "TTProxy.mak" CFG="TTProxy - Win32 Debug"
-!MESSAGE 
-!MESSAGE \x91I\x91\xF0\x89\\x82\xC8\xCB\xDE\xD9\xC4\xDE Ӱ\xC4\xDE:
-!MESSAGE 
-!MESSAGE "TTProxy - Win32 Release" ("Win32 (x86) Dynamic-Link Library" \x97p)
-!MESSAGE "TTProxy - Win32 Debug" ("Win32 (x86) Dynamic-Link Library" \x97p)
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "TTProxy - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "."
-# PROP Intermediate_Dir "Release"
-# PROP Ignore_Export_Lib 1
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "TTX_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MT /W3 /O2 /I "../teraterm/source/teraterm" /I "../teraterm/source/common" /I "YCL/include" /I "../openssl/inc32" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "TTX_EXPORTS" /Yu"stdafx.h" /FD /c
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x411 /d "NDEBUG"
-# ADD RSC /l 0x411 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /dll /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib wsock32.lib /nologo /dll /map /machine:I386 /def:".\TTX.def" /out:"TTXProxy.dll" /implib:"Release/TTXProxy.lib"
-# SUBTRACT LINK32 /pdb:none
-
-!ELSEIF  "$(CFG)" == "TTProxy - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Ignore_Export_Lib 1
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "TTX_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /MTd /W3 /Gm /ZI /Od /I "../teraterm/source/teraterm" /I "../teraterm/source/common" /I "YCL/include" /I "../openssl/inc32" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "TTX_EXPORTS" /Yu"stdafx.h" /FD /GZ /c
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x411 /d "_DEBUG"
-# ADD RSC /l 0x411 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib wsock32.lib /nologo /dll /debug /machine:I386 /out:"Debug/TTXProxy.dll" /pdbtype:sept
-
-!ENDIF 
-
-# Begin Target
-
-# Name "TTProxy - Win32 Release"
-# Name "TTProxy - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=.\StdAfx.cpp
-# ADD CPP /Yc"stdafx.h"
-# End Source File
-# Begin Source File
-
-SOURCE=.\TTProxy.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\TTProxy.rc
-# End Source File
-# Begin Source File
-
-SOURCE=.\TTX.def
-
-!IF  "$(CFG)" == "TTProxy - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "TTProxy - Win32 Debug"
-
-!ENDIF 
-
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Source File
-
-SOURCE=.\Hooker.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\Logger.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\ProxyWSockHook.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\SSLSocket.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\StdAfx.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\TTProxy.h
-# End Source File
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# Begin Group "YCL"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=.\YCL\include\YCL\Array.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\YCL\include\YCL\ComboBoxCtrl.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\YCL\include\YCL\common.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\YCL\include\YCL\Dialog.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\YCL\include\YCL\DynamicLinkLibrary.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\YCL\include\YCL\EditBoxCtrl.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\YCL\include\YCL\Enumeration.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\YCL\include\YCL\FileVersion.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\YCL\include\YCL\HASHCODE.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\YCL\include\YCL\Hashtable.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\YCL\include\YCL\IniFile.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\YCL\include\YCL\Integer.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\YCL\include\YCL\libc.cpp
-# PROP Exclude_From_Build 1
-# End Source File
-# Begin Source File
-
-SOURCE=.\YCL\include\YCL\Object.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\YCL\include\YCL\Pointer.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\YCL\include\YCL\Resource.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\YCL\include\YCL\StringBuffer.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\YCL\include\YCL\StringUtil.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\YCL\include\YCL\ValueCtrl.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\YCL\include\YCL\Vector.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\YCL\include\YCL\Window.h
-# End Source File
-# End Group
-# Begin Group "TeraTermPro"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\ttsrcp23\source\common\teraterm.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\ttsrcp23\source\teraterm\ttdialog.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\ttsrcp23\source\common\ttplugin.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\ttsrcp23\source\teraterm\ttsetup.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\ttsrcp23\source\common\tttypes.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\ttsrcp23\source\teraterm\ttwsk.h
-# End Source File
-# End Group
-# End Target
-# End Project

Deleted: branches/ssh_auth_dialog/TTProxy/TTProxy.dsw
===================================================================
--- branches/ssh_auth_dialog/TTProxy/TTProxy.dsw	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/TTProxy/TTProxy.dsw	2019-04-24 14:08:16 UTC (rev 7613)
@@ -1,29 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00
-# \x8Cx\x8D\x90: \x82\xB1\x82\xCCܰ\xB8\xBD\xCD߰\xBD ̧\xB2\xD9 \x82\xF0\x95ҏW\x82܂\xBD\x82͍폜\x82\xB5\x82Ȃ\xA2\x82ł\xAD\x82\xBE\x82\xB3\x82\xA2!
-
-###############################################################################
-
-Project: "TTProxy"="TTProxy.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-

Modified: branches/ssh_auth_dialog/TTProxy/TTProxy.h
===================================================================
--- branches/ssh_auth_dialog/TTProxy/TTProxy.h	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/TTProxy/TTProxy.h	2019-04-24 14:08:16 UTC (rev 7613)
@@ -6,7 +6,7 @@
 
 #include "ProxyWSockHook.h"
 
-extern BOOL PASCAL TTXBind(WORD Version, TTXExports* exports);
+extern "C" __declspec(dllexport) BOOL WINAPI TTXBind(WORD Version, TTXExports* exports);
 
 char UILanguageFile[MAX_PATH];
 
@@ -48,7 +48,7 @@
 
 	static void add_error_message(const char* message) {
 		if (getInstance().error_message != NULL) {
-			StringBuffer buffer = getInstance().error_message;
+			StringBuffer buffer = (const TCHAR *)getInstance().error_message;
 			buffer.append("\n\n");
 			buffer.append(message);
 			getInstance().error_message = buffer.toString();
@@ -249,10 +249,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/ssh_auth_dialog/TTProxy/TTProxy.rc
===================================================================
--- branches/ssh_auth_dialog/TTProxy/TTProxy.rc	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/TTProxy/TTProxy.rc	2019-04-24 14:08:16 UTC (rev 7613)
@@ -7,7 +7,7 @@
 //
 // Generated from the TEXTINCLUDE 2 resource.
 //
-#include <winres.h>
+//#include <winres.h>
 #include <winnt.rh>
 #include <winuser.rh>
 #include <commctrl.rh>

Modified: branches/ssh_auth_dialog/TTProxy/TTProxy.v10.vcxproj
===================================================================
--- branches/ssh_auth_dialog/TTProxy/TTProxy.v10.vcxproj	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/TTProxy/TTProxy.v10.vcxproj	2019-04-24 14:08:16 UTC (rev 7613)
@@ -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/ssh_auth_dialog/TTProxy/TTProxy.v10.vcxproj.filters
===================================================================
--- branches/ssh_auth_dialog/TTProxy/TTProxy.v10.vcxproj.filters	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/TTProxy/TTProxy.v10.vcxproj.filters	2019-04-24 14:08:16 UTC (rev 7613)
@@ -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/ssh_auth_dialog/TTProxy/TTProxy.v11.vcxproj
===================================================================
--- branches/ssh_auth_dialog/TTProxy/TTProxy.v11.vcxproj	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/TTProxy/TTProxy.v11.vcxproj	2019-04-24 14:08:16 UTC (rev 7613)
@@ -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/ssh_auth_dialog/TTProxy/TTProxy.v11.vcxproj.filters
===================================================================
--- branches/ssh_auth_dialog/TTProxy/TTProxy.v11.vcxproj.filters	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/TTProxy/TTProxy.v11.vcxproj.filters	2019-04-24 14:08:16 UTC (rev 7613)
@@ -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/ssh_auth_dialog/TTProxy/TTProxy.v12.vcxproj
===================================================================
--- branches/ssh_auth_dialog/TTProxy/TTProxy.v12.vcxproj	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/TTProxy/TTProxy.v12.vcxproj	2019-04-24 14:08:16 UTC (rev 7613)
@@ -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/ssh_auth_dialog/TTProxy/TTProxy.v12.vcxproj.filters
===================================================================
--- branches/ssh_auth_dialog/TTProxy/TTProxy.v12.vcxproj.filters	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/TTProxy/TTProxy.v12.vcxproj.filters	2019-04-24 14:08:16 UTC (rev 7613)
@@ -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/ssh_auth_dialog/TTProxy/TTProxy.v14.vcxproj
===================================================================
--- branches/ssh_auth_dialog/TTProxy/TTProxy.v14.vcxproj	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/TTProxy/TTProxy.v14.vcxproj	2019-04-24 14:08:16 UTC (rev 7613)
@@ -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/ssh_auth_dialog/TTProxy/TTProxy.v14.vcxproj.filters
===================================================================
--- branches/ssh_auth_dialog/TTProxy/TTProxy.v14.vcxproj.filters	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/TTProxy/TTProxy.v14.vcxproj.filters	2019-04-24 14:08:16 UTC (rev 7613)
@@ -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/ssh_auth_dialog/TTProxy/TTProxy.v15.vcxproj
===================================================================
--- branches/ssh_auth_dialog/TTProxy/TTProxy.v15.vcxproj	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/TTProxy/TTProxy.v15.vcxproj	2019-04-24 14:08:16 UTC (rev 7613)
@@ -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/ssh_auth_dialog/TTProxy/TTProxy.v15.vcxproj.filters
===================================================================
--- branches/ssh_auth_dialog/TTProxy/TTProxy.v15.vcxproj.filters	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/TTProxy/TTProxy.v15.vcxproj.filters	2019-04-24 14:08:16 UTC (rev 7613)
@@ -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/ssh_auth_dialog/TTProxy/TTProxy.v16.sln
===================================================================
--- branches/ssh_auth_dialog/TTProxy/TTProxy.v16.sln	                        (rev 0)
+++ branches/ssh_auth_dialog/TTProxy/TTProxy.v16.sln	2019-04-24 14:08:16 UTC (rev 7613)
@@ -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/ssh_auth_dialog/TTProxy/TTProxy.v16.vcxproj (from rev 7520, branches/ssh_auth_dialog/TTProxy/TTProxy.v15.vcxproj)
===================================================================
--- branches/ssh_auth_dialog/TTProxy/TTProxy.v16.vcxproj	                        (rev 0)
+++ branches/ssh_auth_dialog/TTProxy/TTProxy.v16.vcxproj	2019-04-24 14:08:16 UTC (rev 7613)
@@ -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/ssh_auth_dialog/TTProxy/TTProxy.v16.vcxproj.filters (from rev 7520, branches/ssh_auth_dialog/TTProxy/TTProxy.v15.vcxproj.filters)
===================================================================
--- branches/ssh_auth_dialog/TTProxy/TTProxy.v16.vcxproj.filters	                        (rev 0)
+++ branches/ssh_auth_dialog/TTProxy/TTProxy.v16.vcxproj.filters	2019-04-24 14:08:16 UTC (rev 7613)
@@ -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/ssh_auth_dialog/TTProxy/TTProxy.v9.vcproj
===================================================================
--- branches/ssh_auth_dialog/TTProxy/TTProxy.v9.vcproj	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/TTProxy/TTProxy.v9.vcproj	2019-04-24 14:08:16 UTC (rev 7613)
@@ -211,6 +211,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/ssh_auth_dialog/TTProxy/TTProxy.vcproj
===================================================================
--- branches/ssh_auth_dialog/TTProxy/TTProxy.vcproj	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/TTProxy/TTProxy.vcproj	2019-04-24 14:08:16 UTC (rev 7613)
@@ -72,7 +72,7 @@
 			<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"
@@ -167,7 +167,7 @@
 			<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"
@@ -212,6 +212,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/ssh_auth_dialog/TTProxy/YCL/include/YCL/Array.h
===================================================================
--- branches/ssh_auth_dialog/TTProxy/YCL/include/YCL/Array.h	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/TTProxy/YCL/include/YCL/Array.h	2019-04-24 14:08:16 UTC (rev 7613)
@@ -53,17 +53,21 @@
 			array[i] = source[i];
 		}
 	}
+#if 0
 	void copyFrom(Array* source) {
 		copy(source->array[i]);
 	}
+#endif
 	void copyTo(TYPE distination[])const {
 		for (int i = 0; i < length; i++) {
 			distination[i] = array[i];
 		}
 	}
+#if 0
 	void copyTo(Array* distination)const {
 		copyTo(distination->array[i]);
 	}
+#endif
 };
 
 }

Modified: branches/ssh_auth_dialog/TTProxy/YCL/include/YCL/Dialog.h
===================================================================
--- branches/ssh_auth_dialog/TTProxy/YCL/include/YCL/Dialog.h	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/TTProxy/YCL/include/YCL/Dialog.h	2019-04-24 14:08:16 UTC (rev 7613)
@@ -14,6 +14,8 @@
 #include <YCL/Window.h>
 #include <YCL/Hashtable.h>
 
+#include "dlglib.h"
+
 namespace yebisuya {
 
 class Dialog : virtual public Window {
@@ -109,7 +111,11 @@
 	}
 	int open(HINSTANCE instance, int resourceId, HWND owner = NULL) {
 		YCLVERIFY(prepareOpen(this) == NULL, "Another dialog has been opening yet.");
+#if 0
 		return ::DialogBoxParam(instance, MAKEINTRESOURCE(resourceId), owner, DialogProc, NULL);
+#else
+		return TTDialogBoxParam(instance, MAKEINTRESOURCE(resourceId), owner, DialogProc, NULL);
+#endif
 	}
 protected:
 	virtual bool dispatch(int message, int wparam, long lparam) {

Modified: branches/ssh_auth_dialog/TTProxy/YCL/include/YCL/HASHCODE.h
===================================================================
--- branches/ssh_auth_dialog/TTProxy/YCL/include/YCL/HASHCODE.h	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/TTProxy/YCL/include/YCL/HASHCODE.h	2019-04-24 14:08:16 UTC (rev 7613)
@@ -25,7 +25,7 @@
 	}
 	HASHCODE(const HASHCODE& code):value(code.value) {
 	}
-	HASHCODE(void* value):value((int) value) {
+	HASHCODE(const void* value):value((int)(uintptr_t) value) {
 	}
 	HASHCODE(int value):value(value) {
 	}

Modified: branches/ssh_auth_dialog/TTProxy/YCL/include/YCL/Hashtable.h
===================================================================
--- branches/ssh_auth_dialog/TTProxy/YCL/include/YCL/Hashtable.h	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/TTProxy/YCL/include/YCL/Hashtable.h	2019-04-24 14:08:16 UTC (rev 7613)
@@ -122,7 +122,7 @@
 	//	\x91S\x82ẴG\x83\x93\x83g\x83\x8A\x82\xAA\x90ݒ\xE8\x8Dς݂\xC5key\x82Ɠ\x99\x82\xB5\x82\xA2\x82\xE0\x82̂\xAA\x82Ȃ\xAF\x82\xEA\x82\xCE-1\x82\xF0\x95Ԃ\xB7\x81B
 	int find(const TYPE_KEY& key)const {
 		int found = -1;
-		int h = HASHCODE(key);
+		int h = HASHCODE(&key);
 		for (int i = 0; i < backetSize; i++) {
 			int index = ((unsigned) h + i) % backetSize;
 			const TYPE_KEY& bkey = backet[index].key;

Modified: branches/ssh_auth_dialog/TTProxy/YCL/include/YCL/common.h
===================================================================
--- branches/ssh_auth_dialog/TTProxy/YCL/include/YCL/common.h	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/TTProxy/YCL/include/YCL/common.h	2019-04-24 14:08:16 UTC (rev 7613)
@@ -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)) {__asm { int 3 }}
 #define YCLVERIFY(condition, message) if (YclAssert(condition, message)) {__asm { int 3 }}
 
-#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
 //{

Modified: branches/ssh_auth_dialog/TTXKanjiMenu/CMakeLists.txt
===================================================================
--- branches/ssh_auth_dialog/TTXKanjiMenu/CMakeLists.txt	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/TTXKanjiMenu/CMakeLists.txt	2019-04-24 14:08:16 UTC (rev 7613)
@@ -24,6 +24,12 @@
   ${SRC}
   )
 
+set_target_properties(
+  ttxkanjimenu
+  PROPERTIES
+  PREFIX ""
+  )
+
 target_link_libraries(
   ttxkanjimenu
   ttpcmn

Modified: branches/ssh_auth_dialog/TTXKanjiMenu/ttxkanjimenu.rc
===================================================================
--- branches/ssh_auth_dialog/TTXKanjiMenu/ttxkanjimenu.rc	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/TTXKanjiMenu/ttxkanjimenu.rc	2019-04-24 14:08:16 UTC (rev 7613)
@@ -7,7 +7,7 @@
 //
 // Generated from the TEXTINCLUDE 2 resource.
 //
-#include "afxres.h"
+#include <windows.h>
 
 /////////////////////////////////////////////////////////////////////////////
 #undef APSTUDIO_READONLY_SYMBOLS

Added: branches/ssh_auth_dialog/TTXKanjiMenu/ttxkanjimenu.v16.sln
===================================================================
--- branches/ssh_auth_dialog/TTXKanjiMenu/ttxkanjimenu.v16.sln	                        (rev 0)
+++ branches/ssh_auth_dialog/TTXKanjiMenu/ttxkanjimenu.v16.sln	2019-04-24 14:08:16 UTC (rev 7613)
@@ -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/ssh_auth_dialog/TTXKanjiMenu/ttxkanjimenu.v16.vcxproj (from rev 7520, branches/ssh_auth_dialog/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.v15.vcxproj)
===================================================================
--- branches/ssh_auth_dialog/TTXKanjiMenu/ttxkanjimenu.v16.vcxproj	                        (rev 0)
+++ branches/ssh_auth_dialog/TTXKanjiMenu/ttxkanjimenu.v16.vcxproj	2019-04-24 14:08:16 UTC (rev 7613)
@@ -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/ssh_auth_dialog/TTXKanjiMenu/ttxkanjimenu.v16.vcxproj.filters (from rev 7520, branches/ssh_auth_dialog/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.v10.vcxproj.filters)
===================================================================
--- branches/ssh_auth_dialog/TTXKanjiMenu/ttxkanjimenu.v16.vcxproj.filters	                        (rev 0)
+++ branches/ssh_auth_dialog/TTXKanjiMenu/ttxkanjimenu.v16.vcxproj.filters	2019-04-24 14:08:16 UTC (rev 7613)
@@ -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/ssh_auth_dialog/TTXKanjiMenu/ttxkanjimenu.vcproj
===================================================================
--- branches/ssh_auth_dialog/TTXKanjiMenu/ttxkanjimenu.vcproj	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/TTXKanjiMenu/ttxkanjimenu.vcproj	2019-04-24 14:08:16 UTC (rev 7613)
@@ -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"

Modified: branches/ssh_auth_dialog/TTXSamples/TTXAdditionalTitle/CMakeLists.txt
===================================================================
--- branches/ssh_auth_dialog/TTXSamples/TTXAdditionalTitle/CMakeLists.txt	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/TTXSamples/TTXAdditionalTitle/CMakeLists.txt	2019-04-24 14:08:16 UTC (rev 7613)
@@ -18,9 +18,14 @@
   ${SRC}
   )
 
+set_target_properties(
+  TTXAdditionalTitle
+  PROPERTIES
+  PREFIX ""
+  )
+
 target_link_libraries(
   TTXAdditionalTitle
   ttpcmn
   )
 
-

Copied: branches/ssh_auth_dialog/TTXSamples/TTXAdditionalTitle/TTXAdditionalTitle.v16.vcxproj (from rev 7520, branches/ssh_auth_dialog/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.v15.vcxproj)
===================================================================
--- branches/ssh_auth_dialog/TTXSamples/TTXAdditionalTitle/TTXAdditionalTitle.v16.vcxproj	                        (rev 0)
+++ branches/ssh_auth_dialog/TTXSamples/TTXAdditionalTitle/TTXAdditionalTitle.v16.vcxproj	2019-04-24 14:08:16 UTC (rev 7613)
@@ -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/ssh_auth_dialog/TTXSamples/TTXAdditionalTitle/TTXAdditionalTitle.v16.vcxproj.filters
===================================================================
--- branches/ssh_auth_dialog/TTXSamples/TTXAdditionalTitle/TTXAdditionalTitle.v16.vcxproj.filters	                        (rev 0)
+++ branches/ssh_auth_dialog/TTXSamples/TTXAdditionalTitle/TTXAdditionalTitle.v16.vcxproj.filters	2019-04-24 14:08:16 UTC (rev 7613)
@@ -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/ssh_auth_dialog/TTXSamples/TTXAdditionalTitle/TTXAdditionalTitle.vcproj
===================================================================
--- branches/ssh_auth_dialog/TTXSamples/TTXAdditionalTitle/TTXAdditionalTitle.vcproj	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/TTXSamples/TTXAdditionalTitle/TTXAdditionalTitle.vcproj	2019-04-24 14:08:16 UTC (rev 7613)
@@ -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"

Modified: branches/ssh_auth_dialog/TTXSamples/TTXAlwaysOnTop/CMakeLists.txt
===================================================================
--- branches/ssh_auth_dialog/TTXSamples/TTXAlwaysOnTop/CMakeLists.txt	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/TTXSamples/TTXAlwaysOnTop/CMakeLists.txt	2019-04-24 14:08:16 UTC (rev 7613)
@@ -22,6 +22,12 @@
   ${SRC}
   )
 
+set_target_properties(
+  TTXAlwaysOnTop
+  PROPERTIES
+  PREFIX ""
+  )
+
 target_link_libraries(
   TTXAlwaysOnTop
   ttpcmn

Modified: branches/ssh_auth_dialog/TTXSamples/TTXAlwaysOnTop/TTXAlwaysOnTop.c
===================================================================
--- branches/ssh_auth_dialog/TTXSamples/TTXAlwaysOnTop/TTXAlwaysOnTop.c	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/TTXSamples/TTXAlwaysOnTop/TTXAlwaysOnTop.c	2019-04-24 14:08:16 UTC (rev 7613)
@@ -7,7 +7,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
-#include <Windows.h>
+#include <windows.h>
 
 #include "compat_w95.h"
 

Copied: branches/ssh_auth_dialog/TTXSamples/TTXAlwaysOnTop/TTXAlwaysOnTop.v16.vcxproj (from rev 7520, branches/ssh_auth_dialog/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.v15.vcxproj)
===================================================================
--- branches/ssh_auth_dialog/TTXSamples/TTXAlwaysOnTop/TTXAlwaysOnTop.v16.vcxproj	                        (rev 0)
+++ branches/ssh_auth_dialog/TTXSamples/TTXAlwaysOnTop/TTXAlwaysOnTop.v16.vcxproj	2019-04-24 14:08:16 UTC (rev 7613)
@@ -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/ssh_auth_dialog/TTXSamples/TTXAlwaysOnTop/TTXAlwaysOnTop.v16.vcxproj.filters
===================================================================
--- branches/ssh_auth_dialog/TTXSamples/TTXAlwaysOnTop/TTXAlwaysOnTop.v16.vcxproj.filters	                        (rev 0)
+++ branches/ssh_auth_dialog/TTXSamples/TTXAlwaysOnTop/TTXAlwaysOnTop.v16.vcxproj.filters	2019-04-24 14:08:16 UTC (rev 7613)
@@ -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/ssh_auth_dialog/TTXSamples/TTXAlwaysOnTop/TTXAlwaysOnTop.vcproj
===================================================================
--- branches/ssh_auth_dialog/TTXSamples/TTXAlwaysOnTop/TTXAlwaysOnTop.vcproj	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/TTXSamples/TTXAlwaysOnTop/TTXAlwaysOnTop.vcproj	2019-04-24 14:08:16 UTC (rev 7613)
@@ -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"

Modified: branches/ssh_auth_dialog/TTXSamples/TTXCallSysMenu/CMakeLists.txt
===================================================================
--- branches/ssh_auth_dialog/TTXSamples/TTXCallSysMenu/CMakeLists.txt	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/TTXSamples/TTXCallSysMenu/CMakeLists.txt	2019-04-24 14:08:16 UTC (rev 7613)
@@ -17,3 +17,9 @@
   TTXCallSysMenu SHARED
   ${SRC}
   )
+
+set_target_properties(
+  TTXCallSysMenu
+  PROPERTIES
+  PREFIX ""
+  )

Copied: branches/ssh_auth_dialog/TTXSamples/TTXCallSysMenu/TTXCallSysMenu.v16.vcxproj (from rev 7520, branches/ssh_auth_dialog/TTXSamples/TTXViewMode/TTXViewMode.v15.vcxproj)
===================================================================
--- branches/ssh_auth_dialog/TTXSamples/TTXCallSysMenu/TTXCallSysMenu.v16.vcxproj	                        (rev 0)
+++ branches/ssh_auth_dialog/TTXSamples/TTXCallSysMenu/TTXCallSysMenu.v16.vcxproj	2019-04-24 14:08:16 UTC (rev 7613)
@@ -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/ssh_auth_dialog/TTXSamples/TTXCallSysMenu/TTXCallSysMenu.v16.vcxproj.filters
===================================================================
--- branches/ssh_auth_dialog/TTXSamples/TTXCallSysMenu/TTXCallSysMenu.v16.vcxproj.filters	                        (rev 0)
+++ branches/ssh_auth_dialog/TTXSamples/TTXCallSysMenu/TTXCallSysMenu.v16.vcxproj.filters	2019-04-24 14:08:16 UTC (rev 7613)
@@ -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/ssh_auth_dialog/TTXSamples/TTXCallSysMenu/TTXCallSysMenu.vcproj
===================================================================
--- branches/ssh_auth_dialog/TTXSamples/TTXCallSysMenu/TTXCallSysMenu.vcproj	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/TTXSamples/TTXCallSysMenu/TTXCallSysMenu.vcproj	2019-04-24 14:08:16 UTC (rev 7613)
@@ -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/ssh_auth_dialog/TTXSamples/TTXCommandLineOpt/CMakeLists.txt
===================================================================
--- branches/ssh_auth_dialog/TTXSamples/TTXCommandLineOpt/CMakeLists.txt	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/TTXSamples/TTXCommandLineOpt/CMakeLists.txt	2019-04-24 14:08:16 UTC (rev 7613)
@@ -18,6 +18,12 @@
   ${SRC}
   )
 
+set_target_properties(
+  TTXCommandLineOpt
+  PROPERTIES
+  PREFIX ""
+  )
+
 target_link_libraries(
   TTXCommandLineOpt
   ttpcmn

Copied: branches/ssh_auth_dialog/TTXSamples/TTXCommandLineOpt/TTXCommandLineOpt.v16.vcxproj (from rev 7520, branches/ssh_auth_dialog/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.v15.vcxproj)
===================================================================
--- branches/ssh_auth_dialog/TTXSamples/TTXCommandLineOpt/TTXCommandLineOpt.v16.vcxproj	                        (rev 0)
+++ branches/ssh_auth_dialog/TTXSamples/TTXCommandLineOpt/TTXCommandLineOpt.v16.vcxproj	2019-04-24 14:08:16 UTC (rev 7613)
@@ -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/ssh_auth_dialog/TTXSamples/TTXCommandLineOpt/TTXCommandLineOpt.v16.vcxproj.filters
===================================================================
--- branches/ssh_auth_dialog/TTXSamples/TTXCommandLineOpt/TTXCommandLineOpt.v16.vcxproj.filters	                        (rev 0)
+++ branches/ssh_auth_dialog/TTXSamples/TTXCommandLineOpt/TTXCommandLineOpt.v16.vcxproj.filters	2019-04-24 14:08:16 UTC (rev 7613)
@@ -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

Modified: branches/ssh_auth_dialog/TTXSamples/TTXCopyIniFile/CMakeLists.txt
===================================================================
--- branches/ssh_auth_dialog/TTXSamples/TTXCopyIniFile/CMakeLists.txt	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/TTXSamples/TTXCopyIniFile/CMakeLists.txt	2019-04-24 14:08:16 UTC (rev 7613)
@@ -18,4 +18,8 @@
   ${SRC}
   )
 
-
+set_target_properties(
+  TTXCopyIniFile
+  PROPERTIES
+  PREFIX ""
+  )

Copied: branches/ssh_auth_dialog/TTXSamples/TTXCopyIniFile/TTXCopyIniFile.v16.vcxproj (from rev 7520, branches/ssh_auth_dialog/TTXSamples/TTXViewMode/TTXViewMode.v15.vcxproj)
===================================================================
--- branches/ssh_auth_dialog/TTXSamples/TTXCopyIniFile/TTXCopyIniFile.v16.vcxproj	                        (rev 0)
+++ branches/ssh_auth_dialog/TTXSamples/TTXCopyIniFile/TTXCopyIniFile.v16.vcxproj	2019-04-24 14:08:16 UTC (rev 7613)
@@ -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/ssh_auth_dialog/TTXSamples/TTXCopyIniFile/TTXCopyIniFile.v16.vcxproj.filters
===================================================================
--- branches/ssh_auth_dialog/TTXSamples/TTXCopyIniFile/TTXCopyIniFile.v16.vcxproj.filters	                        (rev 0)
+++ branches/ssh_auth_dialog/TTXSamples/TTXCopyIniFile/TTXCopyIniFile.v16.vcxproj.filters	2019-04-24 14:08:16 UTC (rev 7613)
@@ -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

Modified: branches/ssh_auth_dialog/TTXSamples/TTXFixedWinSize/CMakeLists.txt
===================================================================
--- branches/ssh_auth_dialog/TTXSamples/TTXFixedWinSize/CMakeLists.txt	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/TTXSamples/TTXFixedWinSize/CMakeLists.txt	2019-04-24 14:08:16 UTC (rev 7613)
@@ -18,4 +18,8 @@
   ${SRC}
   )
 
-
+set_target_properties(
+  TTXFixedWinSize
+  PROPERTIES
+  PREFIX ""
+  )

Copied: branches/ssh_auth_dialog/TTXSamples/TTXFixedWinSize/TTXFixedWinSize.v16.vcxproj (from rev 7520, branches/ssh_auth_dialog/TTXSamples/TTXViewMode/TTXViewMode.v15.vcxproj)
===================================================================
--- branches/ssh_auth_dialog/TTXSamples/TTXFixedWinSize/TTXFixedWinSize.v16.vcxproj	                        (rev 0)
+++ branches/ssh_auth_dialog/TTXSamples/TTXFixedWinSize/TTXFixedWinSize.v16.vcxproj	2019-04-24 14:08:16 UTC (rev 7613)
@@ -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/ssh_auth_dialog/TTXSamples/TTXFixedWinSize/TTXFixedWinSize.v16.vcxproj.filters
===================================================================
--- branches/ssh_auth_dialog/TTXSamples/TTXFixedWinSize/TTXFixedWinSize.v16.vcxproj.filters	                        (rev 0)
+++ branches/ssh_auth_dialog/TTXSamples/TTXFixedWinSize/TTXFixedWinSize.v16.vcxproj.filters	2019-04-24 14:08:16 UTC (rev 7613)
@@ -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/ssh_auth_dialog/TTXSamples/TTXFixedWinSize/TTXFixedWinSize.vcproj
===================================================================
--- branches/ssh_auth_dialog/TTXSamples/TTXFixedWinSize/TTXFixedWinSize.vcproj	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/TTXSamples/TTXFixedWinSize/TTXFixedWinSize.vcproj	2019-04-24 14:08:16 UTC (rev 7613)
@@ -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/ssh_auth_dialog/TTXSamples/TTXKcodeChange/CMakeLists.txt
===================================================================
--- branches/ssh_auth_dialog/TTXSamples/TTXKcodeChange/CMakeLists.txt	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/TTXSamples/TTXKcodeChange/CMakeLists.txt	2019-04-24 14:08:16 UTC (rev 7613)
@@ -18,4 +18,8 @@
   ${SRC}
   )
 
-
+set_target_properties(
+  TTXKcodeChange
+  PROPERTIES
+  PREFIX ""
+  )

Copied: branches/ssh_auth_dialog/TTXSamples/TTXKcodeChange/TTXKcodeChange.v16.vcxproj (from rev 7520, branches/ssh_auth_dialog/TTXSamples/TTXViewMode/TTXViewMode.v15.vcxproj)
===================================================================
--- branches/ssh_auth_dialog/TTXSamples/TTXKcodeChange/TTXKcodeChange.v16.vcxproj	                        (rev 0)
+++ branches/ssh_auth_dialog/TTXSamples/TTXKcodeChange/TTXKcodeChange.v16.vcxproj	2019-04-24 14:08:16 UTC (rev 7613)
@@ -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/ssh_auth_dialog/TTXSamples/TTXKcodeChange/TTXKcodeChange.v16.vcxproj.filters
===================================================================
--- branches/ssh_auth_dialog/TTXSamples/TTXKcodeChange/TTXKcodeChange.v16.vcxproj.filters	                        (rev 0)
+++ branches/ssh_auth_dialog/TTXSamples/TTXKcodeChange/TTXKcodeChange.v16.vcxproj.filters	2019-04-24 14:08:16 UTC (rev 7613)
@@ -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

Modified: branches/ssh_auth_dialog/TTXSamples/TTXOutputBuffering/CMakeLists.txt
===================================================================
--- branches/ssh_auth_dialog/TTXSamples/TTXOutputBuffering/CMakeLists.txt	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/TTXSamples/TTXOutputBuffering/CMakeLists.txt	2019-04-24 14:08:16 UTC (rev 7613)
@@ -18,4 +18,8 @@
   ${SRC}
   )
 
-
+set_target_properties(
+  TTXOutputBuffering
+  PROPERTIES
+  PREFIX ""
+  )

Copied: branches/ssh_auth_dialog/TTXSamples/TTXOutputBuffering/TTXOutputBuffering.v16.vcxproj (from rev 7520, branches/ssh_auth_dialog/TTXSamples/TTXViewMode/TTXViewMode.v15.vcxproj)
===================================================================
--- branches/ssh_auth_dialog/TTXSamples/TTXOutputBuffering/TTXOutputBuffering.v16.vcxproj	                        (rev 0)
+++ branches/ssh_auth_dialog/TTXSamples/TTXOutputBuffering/TTXOutputBuffering.v16.vcxproj	2019-04-24 14:08:16 UTC (rev 7613)
@@ -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/ssh_auth_dialog/TTXSamples/TTXOutputBuffering/TTXOutputBuffering.v16.vcxproj.filters
===================================================================
--- branches/ssh_auth_dialog/TTXSamples/TTXOutputBuffering/TTXOutputBuffering.v16.vcxproj.filters	                        (rev 0)
+++ branches/ssh_auth_dialog/TTXSamples/TTXOutputBuffering/TTXOutputBuffering.v16.vcxproj.filters	2019-04-24 14:08:16 UTC (rev 7613)
@@ -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/ssh_auth_dialog/TTXSamples/TTXRecurringCommand/CMakeLists.txt
===================================================================
--- branches/ssh_auth_dialog/TTXSamples/TTXRecurringCommand/CMakeLists.txt	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/TTXSamples/TTXRecurringCommand/CMakeLists.txt	2019-04-24 14:08:16 UTC (rev 7613)
@@ -8,6 +8,10 @@
 
 set(COMMON_SRC
   ../../teraterm/common/dlglib.h
+  ../../teraterm/common/dlglib.c
+  ../../teraterm/common/dlglib_cpp.cpp
+  ../../teraterm/common/dlglib_tmpl.cpp
+  ../../teraterm/common/ttlib.c
   )
 
 source_group(
@@ -34,6 +38,12 @@
   ${COMMON_SRC}
   )
 
+set_target_properties(
+  TTXRecurringCommand
+  PROPERTIES
+  PREFIX ""
+  )
+
 target_link_libraries(
   TTXRecurringCommand
   ttpcmn

Modified: branches/ssh_auth_dialog/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.c
===================================================================
--- branches/ssh_auth_dialog/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.c	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.c	2019-04-24 14:08:16 UTC (rev 7613)
@@ -8,6 +8,7 @@
 #include "tt_res.h"
 #include "resource.h"
 #include "i18n.h"
+#include "dlglib.h"
 
 #include "compat_w95.h"
 
@@ -465,12 +466,15 @@
 //
 static LRESULT CALLBACK RecurringCommandSetting(HWND dlg, UINT msg, WPARAM wParam, LPARAM lParam) {
 	char uimsg[MAX_UIMSG];
+#if 0
 	static HFONT DlgFont;
 	LOGFONT logfont;
 	HFONT font;
+#endif
 
 	switch (msg) {
 	  case WM_INITDIALOG:
+#if 0
 	  	font = (HFONT)SendMessage(dlg, WM_GETFONT, 0, 0);
 		GetObject(font, sizeof(LOGFONT), &logfont);
 
@@ -487,6 +491,7 @@
 		else {
 			DlgFont = NULL;
 		}
+#endif
 
 		GetWindowText(dlg, uimsg, sizeof(uimsg));
 		GetI18nStr(SECTION, "DLG_TITLE", pvar->ts->UIMsg, sizeof(pvar->ts->UIMsg), uimsg, pvar->ts->UILanguageFile);
@@ -515,6 +520,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)) {
@@ -548,16 +555,20 @@
 			}
 
 			EndDialog(dlg, IDOK);
+#if 0
 			if (DlgFont != NULL) {
 				DeleteObject(DlgFont);
 			}
+#endif
 			return TRUE;
 
 		  case IDCANCEL:
 			EndDialog(dlg, IDCANCEL);
+#if 0
 			if (DlgFont != NULL) {
 				DeleteObject(DlgFont);
 			}
+#endif
 			return TRUE;
 		}
 		break;
@@ -571,8 +582,11 @@
 static int PASCAL TTXProcessCommand(HWND hWin, WORD cmd) {
 	switch (cmd) {
 	  case ID_MENU_SETUP:
-		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/ssh_auth_dialog/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.v10.vcxproj
===================================================================
--- branches/ssh_auth_dialog/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.v10.vcxproj	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.v10.vcxproj	2019-04-24 14:08:16 UTC (rev 7613)
@@ -85,6 +85,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/ssh_auth_dialog/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.v10.vcxproj.filters
===================================================================
--- branches/ssh_auth_dialog/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.v10.vcxproj.filters	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.v10.vcxproj.filters	2019-04-24 14:08:16 UTC (rev 7613)
@@ -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/ssh_auth_dialog/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.v11.vcxproj
===================================================================
--- branches/ssh_auth_dialog/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.v11.vcxproj	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.v11.vcxproj	2019-04-24 14:08:16 UTC (rev 7613)
@@ -90,6 +90,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/ssh_auth_dialog/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.v11.vcxproj.filters
===================================================================
--- branches/ssh_auth_dialog/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.v11.vcxproj.filters	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.v11.vcxproj.filters	2019-04-24 14:08:16 UTC (rev 7613)
@@ -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/ssh_auth_dialog/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.v12.vcxproj
===================================================================
--- branches/ssh_auth_dialog/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.v12.vcxproj	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.v12.vcxproj	2019-04-24 14:08:16 UTC (rev 7613)
@@ -90,6 +90,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/ssh_auth_dialog/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.v12.vcxproj.filters
===================================================================
--- branches/ssh_auth_dialog/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.v12.vcxproj.filters	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.v12.vcxproj.filters	2019-04-24 14:08:16 UTC (rev 7613)
@@ -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/ssh_auth_dialog/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.v14.vcxproj
===================================================================
--- branches/ssh_auth_dialog/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.v14.vcxproj	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.v14.vcxproj	2019-04-24 14:08:16 UTC (rev 7613)
@@ -90,6 +90,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/ssh_auth_dialog/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.v14.vcxproj.filters
===================================================================
--- branches/ssh_auth_dialog/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.v14.vcxproj.filters	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.v14.vcxproj.filters	2019-04-24 14:08:16 UTC (rev 7613)
@@ -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/ssh_auth_dialog/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.v15.vcxproj
===================================================================
--- branches/ssh_auth_dialog/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.v15.vcxproj	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.v15.vcxproj	2019-04-24 14:08:16 UTC (rev 7613)
@@ -90,6 +90,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/ssh_auth_dialog/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.v15.vcxproj.filters
===================================================================
--- branches/ssh_auth_dialog/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.v15.vcxproj.filters	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.v15.vcxproj.filters	2019-04-24 14:08:16 UTC (rev 7613)
@@ -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/ssh_auth_dialog/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.v16.vcxproj (from rev 7520, branches/ssh_auth_dialog/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.v15.vcxproj)
===================================================================
--- branches/ssh_auth_dialog/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.v16.vcxproj	                        (rev 0)
+++ branches/ssh_auth_dialog/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.v16.vcxproj	2019-04-24 14:08:16 UTC (rev 7613)
@@ -0,0 +1,113 @@
+<?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>
+      <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="..\..\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/ssh_auth_dialog/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.v16.vcxproj.filters (from rev 7520, branches/ssh_auth_dialog/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.v15.vcxproj.filters)
===================================================================
--- branches/ssh_auth_dialog/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.v16.vcxproj.filters	                        (rev 0)
+++ branches/ssh_auth_dialog/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.v16.vcxproj.filters	2019-04-24 14:08:16 UTC (rev 7613)
@@ -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/ssh_auth_dialog/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.v9.vcproj
===================================================================
--- branches/ssh_auth_dialog/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.v9.vcproj	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.v9.vcproj	2019-04-24 14:08:16 UTC (rev 7613)
@@ -178,6 +178,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/ssh_auth_dialog/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.vcproj
===================================================================
--- branches/ssh_auth_dialog/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.vcproj	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.vcproj	2019-04-24 14:08:16 UTC (rev 7613)
@@ -61,7 +61,7 @@
 			/>
 			<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"
 				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 ole32.lib shell32.lib gdi32.lib"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
 				SubSystem="2"
@@ -179,6 +179,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/ssh_auth_dialog/TTXSamples/TTXResizeMenu/CMakeLists.txt
===================================================================
--- branches/ssh_auth_dialog/TTXSamples/TTXResizeMenu/CMakeLists.txt	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/TTXSamples/TTXResizeMenu/CMakeLists.txt	2019-04-24 14:08:16 UTC (rev 7613)
@@ -22,6 +22,12 @@
   ${SRC}
   )
 
+set_target_properties(
+  TTXResizeMenu
+  PROPERTIES
+  PREFIX ""
+  )
+
 target_link_libraries(
   TTXResizeMenu
   ttpcmn

Copied: branches/ssh_auth_dialog/TTXSamples/TTXResizeMenu/TTXResizeMenu.v16.vcxproj (from rev 7520, branches/ssh_auth_dialog/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.v15.vcxproj)
===================================================================
--- branches/ssh_auth_dialog/TTXSamples/TTXResizeMenu/TTXResizeMenu.v16.vcxproj	                        (rev 0)
+++ branches/ssh_auth_dialog/TTXSamples/TTXResizeMenu/TTXResizeMenu.v16.vcxproj	2019-04-24 14:08:16 UTC (rev 7613)
@@ -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/ssh_auth_dialog/TTXSamples/TTXResizeMenu/TTXResizeMenu.v16.vcxproj.filters
===================================================================
--- branches/ssh_auth_dialog/TTXSamples/TTXResizeMenu/TTXResizeMenu.v16.vcxproj.filters	                        (rev 0)
+++ branches/ssh_auth_dialog/TTXSamples/TTXResizeMenu/TTXResizeMenu.v16.vcxproj.filters	2019-04-24 14:08:16 UTC (rev 7613)
@@ -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/ssh_auth_dialog/TTXSamples/TTXResizeMenu/TTXResizeMenu.vcproj
===================================================================
--- branches/ssh_auth_dialog/TTXSamples/TTXResizeMenu/TTXResizeMenu.vcproj	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/TTXSamples/TTXResizeMenu/TTXResizeMenu.vcproj	2019-04-24 14:08:16 UTC (rev 7613)
@@ -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"

Modified: branches/ssh_auth_dialog/TTXSamples/TTXResizeWin/CMakeLists.txt
===================================================================
--- branches/ssh_auth_dialog/TTXSamples/TTXResizeWin/CMakeLists.txt	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/TTXSamples/TTXResizeWin/CMakeLists.txt	2019-04-24 14:08:16 UTC (rev 7613)
@@ -18,4 +18,8 @@
   ${SRC}
   )
 
-
+set_target_properties(
+  TTXResizeWin
+  PROPERTIES
+  PREFIX ""
+  )

Copied: branches/ssh_auth_dialog/TTXSamples/TTXResizeWin/TTXResizeWin.v16.vcxproj (from rev 7520, branches/ssh_auth_dialog/TTXSamples/TTXViewMode/TTXViewMode.v15.vcxproj)
===================================================================
--- branches/ssh_auth_dialog/TTXSamples/TTXResizeWin/TTXResizeWin.v16.vcxproj	                        (rev 0)
+++ branches/ssh_auth_dialog/TTXSamples/TTXResizeWin/TTXResizeWin.v16.vcxproj	2019-04-24 14:08:16 UTC (rev 7613)
@@ -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/ssh_auth_dialog/TTXSamples/TTXResizeWin/TTXResizeWin.v16.vcxproj.filters
===================================================================
--- branches/ssh_auth_dialog/TTXSamples/TTXResizeWin/TTXResizeWin.v16.vcxproj.filters	                        (rev 0)
+++ branches/ssh_auth_dialog/TTXSamples/TTXResizeWin/TTXResizeWin.v16.vcxproj.filters	2019-04-24 14:08:16 UTC (rev 7613)
@@ -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/ssh_auth_dialog/TTXSamples/TTXResizeWin/TTXResizeWin.vcproj
===================================================================
--- branches/ssh_auth_dialog/TTXSamples/TTXResizeWin/TTXResizeWin.vcproj	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/TTXSamples/TTXResizeWin/TTXResizeWin.vcproj	2019-04-24 14:08:16 UTC (rev 7613)
@@ -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/ssh_auth_dialog/TTXSamples/TTXSamples.v16.sln
===================================================================
--- branches/ssh_auth_dialog/TTXSamples/TTXSamples.v16.sln	                        (rev 0)
+++ branches/ssh_auth_dialog/TTXSamples/TTXSamples.v16.sln	2019-04-24 14:08:16 UTC (rev 7613)
@@ -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

Modified: branches/ssh_auth_dialog/TTXSamples/TTXShowCommandLine/CMakeLists.txt
===================================================================
--- branches/ssh_auth_dialog/TTXSamples/TTXShowCommandLine/CMakeLists.txt	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/TTXSamples/TTXShowCommandLine/CMakeLists.txt	2019-04-24 14:08:16 UTC (rev 7613)
@@ -18,4 +18,8 @@
   ${SRC}
   )
 
-
+set_target_properties(
+  TTXShowCommandLine
+  PROPERTIES
+  PREFIX ""
+  )

Copied: branches/ssh_auth_dialog/TTXSamples/TTXShowCommandLine/TTXShowCommandLine.v16.vcxproj (from rev 7520, branches/ssh_auth_dialog/TTXSamples/TTXViewMode/TTXViewMode.v15.vcxproj)
===================================================================
--- branches/ssh_auth_dialog/TTXSamples/TTXShowCommandLine/TTXShowCommandLine.v16.vcxproj	                        (rev 0)
+++ branches/ssh_auth_dialog/TTXSamples/TTXShowCommandLine/TTXShowCommandLine.v16.vcxproj	2019-04-24 14:08:16 UTC (rev 7613)
@@ -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/ssh_auth_dialog/TTXSamples/TTXShowCommandLine/TTXShowCommandLine.v16.vcxproj.filters
===================================================================
--- branches/ssh_auth_dialog/TTXSamples/TTXShowCommandLine/TTXShowCommandLine.v16.vcxproj.filters	                        (rev 0)
+++ branches/ssh_auth_dialog/TTXSamples/TTXShowCommandLine/TTXShowCommandLine.v16.vcxproj.filters	2019-04-24 14:08:16 UTC (rev 7613)
@@ -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/ssh_auth_dialog/TTXSamples/TTXShowCommandLine/TTXShowCommandLine.vcproj
===================================================================
--- branches/ssh_auth_dialog/TTXSamples/TTXShowCommandLine/TTXShowCommandLine.vcproj	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/TTXSamples/TTXShowCommandLine/TTXShowCommandLine.vcproj	2019-04-24 14:08:16 UTC (rev 7613)
@@ -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/ssh_auth_dialog/TTXSamples/TTXViewMode/CMakeLists.txt
===================================================================
--- branches/ssh_auth_dialog/TTXSamples/TTXViewMode/CMakeLists.txt	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/TTXSamples/TTXViewMode/CMakeLists.txt	2019-04-24 14:08:16 UTC (rev 7613)
@@ -2,6 +2,20 @@
 
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/")
 
+set(COMMON_SRC
+  ../../teraterm/common/dlglib.h
+  ../../teraterm/common/dlglib.c
+  ../../teraterm/common/dlglib_cpp.cpp
+  ../../teraterm/common/dlglib_tmpl.cpp
+  ../../teraterm/common/ttlib.c
+  )
+
+source_group(
+  "common"
+  FILES
+  ${COMMON_SRC}
+  )
+
 set(SRC
   resource.h
   TTXViewMode.c
@@ -19,4 +33,18 @@
 add_library(
   TTXViewMode SHARED
   ${SRC}
+  ${COMMON_SRC}
   )
+
+set_target_properties(
+  TTXViewMode
+  PROPERTIES
+  PREFIX ""
+  )
+
+target_link_libraries(
+  TTXViewMode
+  ttpcmn
+  #
+  gdi32
+  )

Modified: branches/ssh_auth_dialog/TTXSamples/TTXViewMode/TTXViewMode.c
===================================================================
--- branches/ssh_auth_dialog/TTXSamples/TTXViewMode/TTXViewMode.c	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/TTXSamples/TTXViewMode/TTXViewMode.c	2019-04-24 14:08:16 UTC (rev 7613)
@@ -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/ssh_auth_dialog/TTXSamples/TTXViewMode/TTXViewMode.v10.vcxproj
===================================================================
--- branches/ssh_auth_dialog/TTXSamples/TTXViewMode/TTXViewMode.v10.vcxproj	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/TTXSamples/TTXViewMode/TTXViewMode.v10.vcxproj	2019-04-24 14:08:16 UTC (rev 7613)
@@ -59,6 +59,7 @@
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
     </ClCompile>
     <Link>
+      <AdditionalDependencies>$(SolutionDir)..\teraterm\$(Configuration)\ttpcmn.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX86</TargetMachine>
@@ -75,6 +76,7 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
     <Link>
+      <AdditionalDependencies>$(SolutionDir)..\teraterm\$(Configuration)\ttpcmn.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>
@@ -83,6 +85,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/ssh_auth_dialog/TTXSamples/TTXViewMode/TTXViewMode.v11.vcxproj
===================================================================
--- branches/ssh_auth_dialog/TTXSamples/TTXViewMode/TTXViewMode.v11.vcxproj	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/TTXSamples/TTXViewMode/TTXViewMode.v11.vcxproj	2019-04-24 14:08:16 UTC (rev 7613)
@@ -64,6 +64,7 @@
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
     </ClCompile>
     <Link>
+      <AdditionalDependencies>$(SolutionDir)..\teraterm\$(Configuration)\ttpcmn.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX86</TargetMachine>
@@ -80,6 +81,7 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
     <Link>
+      <AdditionalDependencies>$(SolutionDir)..\teraterm\$(Configuration)\ttpcmn.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>
@@ -88,6 +90,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/ssh_auth_dialog/TTXSamples/TTXViewMode/TTXViewMode.v12.vcxproj
===================================================================
--- branches/ssh_auth_dialog/TTXSamples/TTXViewMode/TTXViewMode.v12.vcxproj	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/TTXSamples/TTXViewMode/TTXViewMode.v12.vcxproj	2019-04-24 14:08:16 UTC (rev 7613)
@@ -64,6 +64,7 @@
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
     </ClCompile>
     <Link>
+      <AdditionalDependencies>$(SolutionDir)..\teraterm\$(Configuration)\ttpcmn.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX86</TargetMachine>
@@ -80,6 +81,7 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
     <Link>
+      <AdditionalDependencies>$(SolutionDir)..\teraterm\$(Configuration)\ttpcmn.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>
@@ -88,6 +90,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/ssh_auth_dialog/TTXSamples/TTXViewMode/TTXViewMode.v14.vcxproj
===================================================================
--- branches/ssh_auth_dialog/TTXSamples/TTXViewMode/TTXViewMode.v14.vcxproj	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/TTXSamples/TTXViewMode/TTXViewMode.v14.vcxproj	2019-04-24 14:08:16 UTC (rev 7613)
@@ -64,6 +64,7 @@
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
     </ClCompile>
     <Link>
+      <AdditionalDependencies>$(SolutionDir)..\teraterm\$(Configuration)\ttpcmn.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX86</TargetMachine>
@@ -80,6 +81,7 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
     <Link>
+      <AdditionalDependencies>$(SolutionDir)..\teraterm\$(Configuration)\ttpcmn.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>
@@ -88,6 +90,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/ssh_auth_dialog/TTXSamples/TTXViewMode/TTXViewMode.v15.vcxproj
===================================================================
--- branches/ssh_auth_dialog/TTXSamples/TTXViewMode/TTXViewMode.v15.vcxproj	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/TTXSamples/TTXViewMode/TTXViewMode.v15.vcxproj	2019-04-24 14:08:16 UTC (rev 7613)
@@ -64,6 +64,7 @@
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
     </ClCompile>
     <Link>
+      <AdditionalDependencies>$(SolutionDir)..\teraterm\$(Configuration)\ttpcmn.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX86</TargetMachine>
@@ -80,6 +81,7 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
     <Link>
+      <AdditionalDependencies>$(SolutionDir)..\teraterm\$(Configuration)\ttpcmn.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>
@@ -88,6 +90,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>

Copied: branches/ssh_auth_dialog/TTXSamples/TTXViewMode/TTXViewMode.v16.vcxproj (from rev 7520, branches/ssh_auth_dialog/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.v15.vcxproj)
===================================================================
--- branches/ssh_auth_dialog/TTXSamples/TTXViewMode/TTXViewMode.v16.vcxproj	                        (rev 0)
+++ branches/ssh_auth_dialog/TTXSamples/TTXViewMode/TTXViewMode.v16.vcxproj	2019-04-24 14:08:16 UTC (rev 7613)
@@ -0,0 +1,113 @@
+<?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>
+      <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="..\..\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/ssh_auth_dialog/TTXSamples/TTXViewMode/TTXViewMode.v16.vcxproj.filters (from rev 7520, branches/ssh_auth_dialog/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.v15.vcxproj.filters)
===================================================================
--- branches/ssh_auth_dialog/TTXSamples/TTXViewMode/TTXViewMode.v16.vcxproj.filters	                        (rev 0)
+++ branches/ssh_auth_dialog/TTXSamples/TTXViewMode/TTXViewMode.v16.vcxproj.filters	2019-04-24 14:08:16 UTC (rev 7613)
@@ -0,0 +1,43 @@
+<?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>
+  </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/ssh_auth_dialog/TTXSamples/TTXViewMode/TTXViewMode.v9.vcproj
===================================================================
--- branches/ssh_auth_dialog/TTXSamples/TTXViewMode/TTXViewMode.v9.vcproj	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/TTXSamples/TTXViewMode/TTXViewMode.v9.vcproj	2019-04-24 14:08:16 UTC (rev 7613)
@@ -62,6 +62,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalDependencies=""$(SolutionDir)..\teraterm\$(ConfigurationName)\ttpcmn.lib" user32.lib ole32.lib shell32.lib gdi32.lib"
 				LinkIncremental="2"
 				GenerateDebugInformation="true"
 				SubSystem="2"
@@ -135,6 +136,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalDependencies=""$(SolutionDir)..\teraterm\$(ConfigurationName)\ttpcmn.lib" user32.lib ole32.lib shell32.lib gdi32.lib"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
 				SubSystem="2"
@@ -176,6 +178,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/ssh_auth_dialog/TTXSamples/TTXViewMode/TTXViewMode.vcproj
===================================================================
--- branches/ssh_auth_dialog/TTXSamples/TTXViewMode/TTXViewMode.vcproj	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/TTXSamples/TTXViewMode/TTXViewMode.vcproj	2019-04-24 14:08:16 UTC (rev 7613)
@@ -61,6 +61,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalDependencies=""$(SolutionDir)..\teraterm\$(ConfigurationName)\ttpcmn.lib" user32.lib ole32.lib shell32.lib gdi32.lib"
 				LinkIncremental="2"
 				GenerateDebugInformation="true"
 				SubSystem="2"
@@ -135,6 +136,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalDependencies=""$(SolutionDir)..\teraterm\$(ConfigurationName)\ttpcmn.lib" user32.lib ole32.lib shell32.lib gdi32.lib"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
 				SubSystem="2"
@@ -177,6 +179,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/ssh_auth_dialog/TTXSamples/TTXttyrec/TTXttyplay.c
===================================================================
--- branches/ssh_auth_dialog/TTXSamples/TTXttyrec/TTXttyplay.c	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/TTXSamples/TTXttyrec/TTXttyplay.c	2019-04-24 14:08:16 UTC (rev 7613)
@@ -106,7 +106,7 @@
 	pvar->ChangeTitle = FALSE;
 	pvar->ReplaceHostDlg = FALSE;
 	pvar->played = FALSE;
-	gettimeofday(&(pvar->last), NULL);
+	gettimeofday(&(pvar->last) /*, NULL*/ );
 	pvar->wait.tv_sec = 0;
 	pvar->wait.tv_usec = 1;
 	pvar->pause = FALSE;
@@ -131,11 +131,12 @@
 
 static BOOL PASCAL TTXReadFile(HANDLE fh, LPVOID obuff, DWORD oblen, LPDWORD rbytes, LPOVERLAPPED rol) {
 	static struct recheader prh = { 0, 0, 0 };
-	static unsigned int lbytes;
+	static DWORD lbytes;
 	static char ibuff[BUFFSIZE];
 	static BOOL title_changed = FALSE, first_title_changed = FALSE;
 
-	int b[3], rsize;
+	int b[3];
+	DWORD rsize;
 	struct recheader h;
 	struct timeval curtime;
 	struct timeval tdiff;
@@ -189,7 +190,7 @@
 	}
 
 	if (!pvar->nowait) {
-		gettimeofday(&curtime, NULL);
+		gettimeofday(&curtime /*, NULL*/ );
 		tdiff = tvdiff(pvar->last, curtime);
 	}
 

Copied: branches/ssh_auth_dialog/TTXSamples/TTXttyrec/TTXttyplay.v16.vcxproj (from rev 7520, branches/ssh_auth_dialog/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.v15.vcxproj)
===================================================================
--- branches/ssh_auth_dialog/TTXSamples/TTXttyrec/TTXttyplay.v16.vcxproj	                        (rev 0)
+++ branches/ssh_auth_dialog/TTXSamples/TTXttyrec/TTXttyplay.v16.vcxproj	2019-04-24 14:08:16 UTC (rev 7613)
@@ -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/ssh_auth_dialog/TTXSamples/TTXttyrec/TTXttyplay.v16.vcxproj.filters (from rev 7520, branches/ssh_auth_dialog/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.v15.vcxproj.filters)
===================================================================
--- branches/ssh_auth_dialog/TTXSamples/TTXttyrec/TTXttyplay.v16.vcxproj.filters	                        (rev 0)
+++ branches/ssh_auth_dialog/TTXSamples/TTXttyrec/TTXttyplay.v16.vcxproj.filters	2019-04-24 14:08:16 UTC (rev 7613)
@@ -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/ssh_auth_dialog/TTXSamples/TTXttyrec/TTXttyplay.vcproj
===================================================================
--- branches/ssh_auth_dialog/TTXSamples/TTXttyrec/TTXttyplay.vcproj	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/TTXSamples/TTXttyrec/TTXttyplay.vcproj	2019-04-24 14:08:16 UTC (rev 7613)
@@ -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"

Modified: branches/ssh_auth_dialog/TTXSamples/TTXttyrec/TTXttyrec.c
===================================================================
--- branches/ssh_auth_dialog/TTXSamples/TTXttyrec/TTXttyrec.c	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/TTXSamples/TTXttyrec/TTXttyrec.c	2019-04-24 14:08:16 UTC (rev 7613)
@@ -106,9 +106,10 @@
 
 void WriteData(HANDLE fh, char *buff, int len) {
   struct timeval t;
-  int b[3], w;
+  int b[3];
+  DWORD w;
 
-  gettimeofday(&t, NULL);
+  gettimeofday(&t /*, NULL*/ );
   b[0] = t.tv_sec;
   b[1] = t.tv_usec;
   b[2] = len;

Copied: branches/ssh_auth_dialog/TTXSamples/TTXttyrec/TTXttyrec.v16.vcxproj (from rev 7520, branches/ssh_auth_dialog/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.v15.vcxproj)
===================================================================
--- branches/ssh_auth_dialog/TTXSamples/TTXttyrec/TTXttyrec.v16.vcxproj	                        (rev 0)
+++ branches/ssh_auth_dialog/TTXSamples/TTXttyrec/TTXttyrec.v16.vcxproj	2019-04-24 14:08:16 UTC (rev 7613)
@@ -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/ssh_auth_dialog/TTXSamples/TTXttyrec/TTXttyrec.v16.vcxproj.filters (from rev 7520, branches/ssh_auth_dialog/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.v15.vcxproj.filters)
===================================================================
--- branches/ssh_auth_dialog/TTXSamples/TTXttyrec/TTXttyrec.v16.vcxproj.filters	                        (rev 0)
+++ branches/ssh_auth_dialog/TTXSamples/TTXttyrec/TTXttyrec.v16.vcxproj.filters	2019-04-24 14:08:16 UTC (rev 7613)
@@ -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/ssh_auth_dialog/TTXSamples/TTXttyrec/TTXttyrec.vcproj
===================================================================
--- branches/ssh_auth_dialog/TTXSamples/TTXttyrec/TTXttyrec.vcproj	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/TTXSamples/TTXttyrec/TTXttyrec.vcproj	2019-04-24 14:08:16 UTC (rev 7613)
@@ -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"

Modified: branches/ssh_auth_dialog/TTXSamples/TTXttyrec/gettimeofday.c
===================================================================
--- branches/ssh_auth_dialog/TTXSamples/TTXttyrec/gettimeofday.c	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/TTXSamples/TTXttyrec/gettimeofday.c	2019-04-24 14:08:16 UTC (rev 7613)
@@ -1,9 +1,15 @@
 #include "gettimeofday.h"
 
-int gettimeofday(struct timeval *tv, struct timezone *tz) {
+// unix time epoch from windows file time 
+#if defined(_MSC_VER)
+#define FTEPOCHDIFF 116444736000000000i64
+#else
+#define FTEPOCHDIFF 116444736000000000LL
+#endif
+
+int gettimeofday(struct timeval *tv /*, struct timezone *tz*/ ) {
 	FILETIME ft;
 	__int64 t;
-	int tzsec, dst;
 
 	if (tv) {
 		GetSystemTimeAsFileTime(&ft);
@@ -12,7 +18,10 @@
 		tv->tv_usec = (long)(t % 1000000);
 	}
 
+#if 0
 	if (tz) {
+		long tzsec;
+		int dst;
 		if (_get_timezone(&tzsec) == 0 && _get_daylight(&dst) == 0) {
 			tz->tz_minuteswest = tzsec / 60;
 			tz->tz_dsttime = dst;
@@ -21,6 +30,7 @@
 			return -1;
 		}
 	}
+#endif
 
 	return 0;
 }

Modified: branches/ssh_auth_dialog/TTXSamples/TTXttyrec/gettimeofday.h
===================================================================
--- branches/ssh_auth_dialog/TTXSamples/TTXttyrec/gettimeofday.h	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/TTXSamples/TTXttyrec/gettimeofday.h	2019-04-24 14:08:16 UTC (rev 7613)
@@ -3,14 +3,14 @@
 #include <windows.h>
 #include <time.h>
 
+#if defined(_MSC_VER)
 struct timezone {
     int tz_minuteswest;
     int tz_dsttime;
 };
+#endif
 
-#define FTEPOCHDIFF 116444736000000000i64
-
-int gettimeofday(struct timeval *tv, struct timezone *tz);
+int gettimeofday(struct timeval *tv /*, struct timezone *tz*/ );
 struct timeval tvdiff(struct timeval a, struct timeval b);
 struct timeval tvshift(struct timeval tv, int shift);
 int tvcmp(struct timeval a, struct timeval b);

Modified: branches/ssh_auth_dialog/TTXSamples/ttxtest/CMakeLists.txt
===================================================================
--- branches/ssh_auth_dialog/TTXSamples/ttxtest/CMakeLists.txt	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/TTXSamples/ttxtest/CMakeLists.txt	2019-04-24 14:08:16 UTC (rev 7613)
@@ -11,3 +11,9 @@
   TTXtest SHARED
   TTXtest.c
   )
+
+set_target_properties(
+  TTXtest
+  PROPERTIES
+  PREFIX ""
+  )

Copied: branches/ssh_auth_dialog/TTXSamples/ttxtest/TTXtest.v16.vcxproj (from rev 7520, branches/ssh_auth_dialog/TTXSamples/TTXViewMode/TTXViewMode.v15.vcxproj)
===================================================================
--- branches/ssh_auth_dialog/TTXSamples/ttxtest/TTXtest.v16.vcxproj	                        (rev 0)
+++ branches/ssh_auth_dialog/TTXSamples/ttxtest/TTXtest.v16.vcxproj	2019-04-24 14:08:16 UTC (rev 7613)
@@ -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/ssh_auth_dialog/TTXSamples/ttxtest/TTXtest.v16.vcxproj.filters
===================================================================
--- branches/ssh_auth_dialog/TTXSamples/ttxtest/TTXtest.v16.vcxproj.filters	                        (rev 0)
+++ branches/ssh_auth_dialog/TTXSamples/ttxtest/TTXtest.v16.vcxproj.filters	2019-04-24 14:08:16 UTC (rev 7613)
@@ -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/ssh_auth_dialog/TTXSamples/ttxtest/TTXtest.vcproj
===================================================================
--- branches/ssh_auth_dialog/TTXSamples/ttxtest/TTXtest.vcproj	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/TTXSamples/ttxtest/TTXtest.vcproj	2019-04-24 14:08:16 UTC (rev 7613)
@@ -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/ssh_auth_dialog/doc/convtext.bat
===================================================================
--- branches/ssh_auth_dialog/doc/convtext.bat	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/doc/convtext.bat	2019-04-24 14:08:16 UTC (rev 7613)
@@ -17,5 +17,12 @@
 %ZLIBCP% -i ..\libs\zlib\README         -o %REF_E%\zlib-LICENSE.txt      -l unix
 %ZLIBCP% -i ..\libs\zlib\README         -o %REF_J%\zlib-LICENSE.txt      -l unix
 
-perl -pe 'tr/\x{feff}//d' ja/html/reference/build_with_cmake.md | perl Markdown_1.0.1/Markdown.pl > ja/html/reference/build_with_cmake_utf8.html
+perl -C -pe 'tr/\x{feff}//d' ja/html/reference/build_with_cmake.md | perl Markdown_1.0.1/Markdown.pl > ja/html/reference/build_with_cmake_utf8.html
 %TOSJIS% -i ja/html/reference/build_with_cmake_utf8.html -o ja/html/reference/build_with_cmake.html  -c utf8
+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/ssh_auth_dialog/doc/en/html/about/history.html
===================================================================
--- branches/ssh_auth_dialog/doc/en/html/about/history.html	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/doc/en/html/about/history.html	2019-04-24 14:08:16 UTC (rev 7613)
@@ -33,9 +33,16 @@
 
 <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><!--IME\x82̕ϊ\xB7\x8C\xF3\x95\xE2\x83E\x83B\x83\x93\x83h\x83E\x82̕\\x8E\xA6\x88ʒu\x82\xAA\x83J\x81[\x83\\x83\x8B\x88ʒu\x82ɒǏ]\x82\xB5\x82Ȃ\xA2\x96\xE2\x91\xE8\x82\xF0\x8FC\x90\xB3\x82\xB5\x82\xBD\x81B-->This bug was introduced in 4.102.</li>
+      <li>Display position of IME's conversion candidate window can not follow cursor position. This bug was introduced in 4.102.</li>
       <li>Can't display character such as U+2014 EM DASH, U+2212 MINUS SIGN, U+301C WAVE DASH etc. This bug was introduced in 4.102.</li>
     </ul>
   </li>

Modified: branches/ssh_auth_dialog/doc/en/html/index.html
===================================================================
--- branches/ssh_auth_dialog/doc/en/html/index.html	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/doc/en/html/index.html	2019-04-24 14:08:16 UTC (rev 7613)
@@ -144,6 +144,13 @@
  <LI><A HREF="reference/SFMT-LICENSE.txt">License of SFMT</A></LI>
  <LI><A HREF="reference/CygTerm+-LICENSE.txt">License of CygTerm+</A></LI>
  <LI><A HREF="reference/develop.txt">For developer</A>
+ <UL>
+   <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/ssh_auth_dialog/doc/en/html/menu/setup-font.html
===================================================================
--- branches/ssh_auth_dialog/doc/en/html/menu/setup-font.html	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/doc/en/html/menu/setup-font.html	2019-04-24 14:08:16 UTC (rev 7613)
@@ -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>

Added: branches/ssh_auth_dialog/doc/en/html/reference/build_library_with_cmake.md
===================================================================
--- branches/ssh_auth_dialog/doc/en/html/reference/build_library_with_cmake.md	                        (rev 0)
+++ branches/ssh_auth_dialog/doc/en/html/reference/build_library_with_cmake.md	2019-04-24 14:08:16 UTC (rev 7613)
@@ -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.

Added: branches/ssh_auth_dialog/doc/en/html/reference/build_with_cmake.md
===================================================================
--- branches/ssh_auth_dialog/doc/en/html/reference/build_with_cmake.md	                        (rev 0)
+++ branches/ssh_auth_dialog/doc/en/html/reference/build_with_cmake.md	2019-04-24 14:08:16 UTC (rev 7613)
@@ -0,0 +1,45 @@
+# How to build by using cmake
+
+- You can build Tera Term by using [cmake](<https://cmake.org/>)(EXPERIMENTAL).
+
+## cmake version
+
+- The final version of cmake supporting for Visual Studio 2005 is 3.11.4.
+- The ttpmacro.exe can not be built with Visual Studio 2005 Express.
+- This no restriction by using Visual Studio any version other than 2005(including Express).
+- When the cmake option is selected on Visual Studio 2017 installer, the cmake can be installed.
+
+## MinGW (very experimental)
+
+- You can create the binary file by using MinGW.
+- EXPERIMENTAL
+- The ttpmacro.exe can not be built with MinGW.
+
+## How to build library
+
+- You can prepare libraries used by Tera Term.
+- Refer to `lib/build_library_with_cmake.md`. 
+- Refet to `develop.txt`.
+
+## How to build Tera Term
+
+Please execute below commands on the top of source tree.
+
+    mkdir build_vs2005
+    cd build_vs2005
+    ..\libs\cmake-3.11.4-win32-x86\bin\cmake.exe .. -G "Visual Studio 8 2005"
+    ..\libs\cmake-3.11.4-win32-x86\bin\cmake.exe --build . --config release
+
+- Change a string after `-G` option according to Visual Studio version.
+- The sln file is created, so the file can be opened with Visual Studio. 
+- If the cmake is included in path, you need not write the full path of cmake.
+- When Visual Studio is launched by sln file and is building, the Visual Studio can re-generate the project file after detecting changes to CMakeLists.txt. So, the sln file is manually created only once.
+
+## How to build Tera Term(MinGW)
+
+Please execute below commands on the top of source tree by using the cmake available on MinGW.
+
+    mkdir build_mingw_test
+    cd build_mingw_test
+    cmake .. -G "Unix Makefiles"
+    make -j4

Modified: branches/ssh_auth_dialog/doc/en/html/reference/develop.txt
===================================================================
--- branches/ssh_auth_dialog/doc/en/html/reference/develop.txt	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/doc/en/html/reference/develop.txt	2019-04-24 14:08:16 UTC (rev 7613)
@@ -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)
@@ -23,6 +25,8 @@
    Note: The executable program which was compiled by this version does not work on Windows Vista, XP, 2000, NT 4.0, 95, 98 and Me.
 -- Visual Studio Community 2017 
    Note: The executable program which was compiled by this version does not work on Windows Vista, XP, 2000, NT 4.0, 95, 98 and Me.
+-- Visual Studio Community 2019
+   Note: The executable program which was compiled by this version does not work on Windows Vista, XP, 2000, NT 4.0, 95, 98 and Me.
 - How to build with batch file
   Please execute the batch file on command prompt of Visual Studio. Otherwise, please configure below environment variables.
   Please call "(x86) Native Tools Command Prompt" of your Visual Studio to register new PATH regarding the compiler path and VSINSTALLDIR variable.

Modified: branches/ssh_auth_dialog/doc/en/teraterm.hhc
===================================================================
--- branches/ssh_auth_dialog/doc/en/teraterm.hhc	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/doc/en/teraterm.hhc	2019-04-24 14:08:16 UTC (rev 7613)
@@ -580,6 +580,24 @@
 			<param name="Local" value="html\reference\develop.txt">
 			<param name="ImageNumber" value="11">
 			</OBJECT>
+		<UL>
+			<LI> <OBJECT type="text/sitemap">
+				<param name="Name" value="Build with CMake build system (experimental)">
+				<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">
 			<param name="Local" value="html\reference\sourcecode.html">

Modified: branches/ssh_auth_dialog/doc/ja/html/about/history.html
===================================================================
--- branches/ssh_auth_dialog/doc/ja/html/about/history.html	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/doc/ja/html/about/history.html	2019-04-24 14:08:16 UTC (rev 7613)
@@ -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\x92ǉ\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/ssh_auth_dialog/doc/ja/html/index.html
===================================================================
--- branches/ssh_auth_dialog/doc/ja/html/index.html	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/doc/ja/html/index.html	2019-04-24 14:08:16 UTC (rev 7613)
@@ -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/ssh_auth_dialog/doc/ja/html/menu/setup-font.html
===================================================================
--- branches/ssh_auth_dialog/doc/ja/html/menu/setup-font.html	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/doc/ja/html/menu/setup-font.html	2019-04-24 14:08:16 UTC (rev 7613)
@@ -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>

Added: branches/ssh_auth_dialog/doc/ja/html/reference/build_library_with_cmake.md
===================================================================
--- branches/ssh_auth_dialog/doc/ja/html/reference/build_library_with_cmake.md	                        (rev 0)
+++ branches/ssh_auth_dialog/doc/ja/html/reference/build_library_with_cmake.md	2019-04-24 14:08:16 UTC (rev 7613)
@@ -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/ssh_auth_dialog/doc/ja/html/reference/build_with_cmake.md
===================================================================
--- branches/ssh_auth_dialog/doc/ja/html/reference/build_with_cmake.md	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/doc/ja/html/reference/build_with_cmake.md	2019-04-24 14:08:16 UTC (rev 7613)
@@ -1,35 +1,51 @@
-# cmakeを使ったビルド
+# cmakeを使ったビルド
 
-- cmake を使用してビルドすることができます(実験的な位置づけです)
-	- https://cmake.org/
+- [cmake](<https://cmake.org/>)を使用して
+  ビルドすることができます(実験的な位置づけです)
 
 ## cmakeのバージョン
 
 - Visual Studio 2005 をサポートしている cmake の最後のバージョンは 3.11.4 です
-- Visual Studio 2005 以外を使用する場合は特に制限はありません
-- Visual Studio 2017 インストーラーで、オプションを選べば cmake をインストールできます
+- Visual Studio 2005 (Expressも含む)以外を使用する場合は特に制限はありません
+- Visual Studio 2017,2019 インストーラーで、オプションを選べば cmake をインストールできます
+- cmake 3.14から Visual Studio 2019 をサポートしています
 
+## MinGW (very experimental)
+
+- MinGW を使用してバイナリを生成することができます
+- 実験的位置づけです
+
 ## ライブラリのビルド
 
 - teraterm が使用するライブラリをビルドして準備しておきます
-- `lib/build_library_with_cmake.md` を参照してください
-- ライブラリは `develop.txt` を参照してください
+- ビルド方法は [`build_library_with_cmake`](<build_library_with_cmake.html>) を参照してください
+- ライブラリについては [`develop.txt`](<develop.txt>) を参照してください
 
 ## teratermのビルド
 
-- ソースツリーのトップから、次のようにコマンドを実行します  
-    ```
+ソースツリーのトップから、次のようにコマンドを実行します。
+
     mkdir build_vs2005
     cd build_vs2005
-	..\libs\cmake-3.11.4-win32-x86\bin\cmake.exe .. -G "Visual Studio 8 2005"
-    ```
-    - `-G` オプションの後ろは使用する Visual Studio のバージョンに合わせて調整します
+    ..\libs\cmake-3.11.4-win32-x86\bin\cmake.exe .. -G "Visual Studio 8 2005"
+    ..\libs\cmake-3.11.4-win32-x86\bin\cmake.exe --build . --config release
+
+- `-G` オプションの後ろは使用する Visual Studio のバージョンに合わせて調整します
 - sln ファイルが生成されるので Visual Studio で開くことができます
-- cmakeを使ってビルドする場合は次のコマンドを実行します  
-    ```
-	..\libs\cmake-3.11.4-win32-x86\bin\cmake.exe --build . --config release
-    ```
 - パスが通っていれば cmake はフルパスで書く必要はありません
 - 生成された 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を使って、
+ソースツリーのトップから、次のようにコマンドを実行します。
+
+    mkdir build_mingw_test
+    cd build_mingw_test
+    cmake .. -G "Unix Makefiles"
+    make -j4

Modified: branches/ssh_auth_dialog/doc/ja/html/reference/develop.txt
===================================================================
--- branches/ssh_auth_dialog/doc/ja/html/reference/develop.txt	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/doc/ja/html/reference/develop.txt	2019-04-24 14:08:16 UTC (rev 7613)
@@ -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)
@@ -27,6 +29,8 @@
 -- Visual Studio Community 2017 
    \x92\x8D: \x83R\x83\x93\x83p\x83C\x83\x8B\x82\xB3\x82ꂽ\x8E\xC0\x8Ds\x83t\x83@\x83C\x83\x8B\x82\xCD Windows Vista, XP, 2000, NT 4.0, 95, 98, Me \x82œ\xAE\x82\xAB\x82܂\xB9\x82\xF1\x81B
        Windows Vista, XP \x82\xF0\x83T\x83|\x81[\x83g\x82\xB7\x82\xE9\x82ɂ\xCD v141_xp \x82\xF0\x8Ew\x92肵\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2\x81B
+-- Visual Studio Community 2019
+   \x92\x8D: \x83R\x83\x93\x83p\x83C\x83\x8B\x82\xB3\x82ꂽ\x8E\xC0\x8Ds\x83t\x83@\x83C\x83\x8B\x82\xCD Windows Vista, XP, 2000, NT 4.0, 95, 98, Me \x82œ\xAE\x82\xAB\x82܂\xB9\x82\xF1\x81B
 - \x83o\x83b\x83`\x83t\x83@\x83C\x83\x8B\x82\xA9\x82\xE7\x83r\x83\x8B\x83h\x82\xB7\x82邽\x82߂\xC9
   Visual Studio \x82̃R\x83}\x83\x93\x83h\x83v\x83\x8D\x83\x93\x83v\x83g\x82\xA9\x82\xE7\x83o\x83b\x83`\x83t\x83@\x83C\x83\x8B\x82\xF0\x8E\xC0\x8Ds\x82\xB7\x82邩\x81A\x88ȉ\xBA\x82̂悤\x82Ɋ\xAB\x95ϐ\x94\x82\xF0\x90ݒ肵\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2\x81B
   \x8Eg\x97p\x82\xB5\x82\xBD\x82\xA2\x83o\x81[\x83W\x83\x87\x83\x93\x82\xCC Visual Studio \x82\xCC "(x86) Native Tools Command Prompt" \x82\xF0\x8E\xC0\x8Ds\x82\xB5\x81A\x83R\x83\x93\x83p\x83C\x83\x89\x82̃p\x83X\x82Ɋ֌W\x82\xB7\x82\xE9 PATH \x82\xC6 VSINSTALLDIR \x95ϐ\x94\x82\xF0\x8A\xAB\x95ϐ\x94\x82ɓo\x98^\x82\xB5\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2\x81B

Modified: branches/ssh_auth_dialog/doc/ja/teraterm.hhc
===================================================================
--- branches/ssh_auth_dialog/doc/ja/teraterm.hhc	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/doc/ja/teraterm.hhc	2019-04-24 14:08:16 UTC (rev 7613)
@@ -589,6 +589,24 @@
 			<param name="Local" value="html\reference\develop.txt">
 			<param name="ImageNumber" value="11">
 			</OBJECT>
+		<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="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">
 			<param name="Local" value="html\reference\sourcecode.html">

Modified: branches/ssh_auth_dialog/installer/build.bat
===================================================================
--- branches/ssh_auth_dialog/installer/build.bat	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/installer/build.bat	2019-04-24 14:08:16 UTC (rev 7613)
@@ -37,11 +37,17 @@
 goto vs2015
 
 :check_2017
-if "%VS150COMNTOOLS%" == "" goto novs
-if not exist "%VS150COMNTOOLS%\VsDevCmd.bat" goto novs
+if "%VS150COMNTOOLS%" == "" goto check_2019
+if not exist "%VS150COMNTOOLS%\VsDevCmd.bat" goto check_2019
 call "%VS150COMNTOOLS%\VsDevCmd.bat"
 goto vs2017
 
+:check_2019
+if "%VS160COMNTOOLS%" == "" goto novs
+if not exist "%VS160COMNTOOLS%\VsDevCmd.bat" goto novs
+call "%VS160COMNTOOLS%\VsDevCmd.bat"
+goto vs2019
+
 :novs
 echo "Can't find Visual Studio"
 exit /b
@@ -58,6 +64,7 @@
 if /I %VSCMNDIR% EQU "%VS120COMNTOOLS%" goto vs2013
 if /I %VSCMNDIR% EQU "%VS140COMNTOOLS%" goto vs2015
 if /I %VSCMNDIR% EQU "%VS150COMNTOOLS%" goto vs2017
+if /I %VSCMNDIR% EQU "%VS160COMNTOOLS%" goto vs2019
 
 echo Unknown Visual Studio version
 exit /b
@@ -125,6 +132,15 @@
 set TTXSAMPLESLN=..\TTXSamples\TTXSamples.v15.sln
 goto vsend
 
+:vs2019
+set TERATERMSLN=..\teraterm\ttermpro.v16.sln
+set TTSSHSLN=..\ttssh2\ttssh.v16.sln
+set TTPROXYSLN=..\TTProxy\TTProxy.v16.sln
+set TTXKANJISLN=..\TTXKanjiMenu\ttxkanjimenu.v16.sln
+set TTPMENUSLN=..\ttpmenu\ttpmenu.v16.sln
+set TTXSAMPLESLN=..\TTXSamples\TTXSamples.v16.sln
+goto vsend
+
 :vsend
 
 set BUILD=build

Modified: branches/ssh_auth_dialog/installer/check_sjis_code.pl
===================================================================
--- branches/ssh_auth_dialog/installer/check_sjis_code.pl	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/installer/check_sjis_code.pl	2019-04-24 14:08:16 UTC (rev 7613)
@@ -26,23 +26,24 @@
 	closedir(DIR);
 	foreach my $path (sort @temp) {
 		next if( $path =~ /^\.{1,2}$/ );                # '.' \x82\xC6 '..' \x82̓X\x83L\x83b\x83v
-		next if( $path =~ /^\.svn$/ );                # '.svn' \x82̓X\x83L\x83b\x83v
-		
+		next if( $path =~ /^\.svn$/ );                  # '.svn' \x82̓X\x83L\x83b\x83v
+
 		my $full_path = "$top_dir" . '/' . "$path";
-		next if (-B $full_path);     # \x83o\x83C\x83i\x83\x8A\x83t\x83@\x83C\x83\x8B\x82̓X\x83L\x83b\x83v
-		
-#		print "$full_path\r\n";                     # \x95\\x8E\xA6\x82\xBE\x82\xAF\x82Ȃ\xE7\x91S\x82Ă\xF0\x95\\x8E\xA6\x82\xB5\x82Ă\xAD\x82\xEA\x82\xE9-------
+#		print "$full_path\r\n";                         # \x95\\x8E\xA6\x82\xBE\x82\xAF\x82Ȃ\xE7\x91S\x82Ă\xF0\x95\\x8E\xA6\x82\xB5\x82Ă\xAD\x82\xEA\x82\xE9-------
 		push(@paths, $full_path);                       # \x83f\x81[\x83^\x82Ƃ\xB5\x82Ď\xE6\x82荞\x82\xF1\x82ł\xE0\x91O\x82̎\xE6\x82荞\x82݂\xAA\x8F\x89\x8A\x{227B0B3}\x82\xEA\x82\xE9
 		if( -d "$top_dir/$path" ){                      #-- \x83f\x83B\x83\x8C\x83N\x83g\x83\x8A\x82̏ꍇ\x82͎\xA9\x95\xAA\x8E\xA9\x90g\x82\xF0\x8CĂяo\x82\xB7
 			&get_file_paths("$full_path");
-			
+		} elsif (-B $full_path) {
+			# \x83o\x83C\x83i\x83\x8A\x83t\x83@\x83C\x83\x8B\x82̓X\x83L\x83b\x83v
+			next;
+
 		} elsif (&check_exclude_file($path)) {
 			print "$full_path skipped\n";
 			next;
-			
+
 		} else {
 			check_sjis_code($full_path);
-		
+
 		}
 	}
 	return \@paths;
@@ -53,7 +54,7 @@
 sub check_exclude_file {
 	my($fn) = shift;
 	my($s);
-	
+
 	foreach $s (@exclude_files) {
 		if ($fn eq $s) {
 			return 1;
@@ -83,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])/) {
@@ -96,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/ssh_auth_dialog/installer/release/lang/English.lng
===================================================================
--- branches/ssh_auth_dialog/installer/release/lang/English.lng	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/installer/release/lang/English.lng	2019-04-24 14:08:16 UTC (rev 7613)
@@ -1,4 +1,4 @@
-; Updated by TeraTerm Project (2019-02-28)
+; Updated by TeraTerm Project (2019-04-17)
 
 [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...

Modified: branches/ssh_auth_dialog/installer/release/lang/French.lng
===================================================================
--- branches/ssh_auth_dialog/installer/release/lang/French.lng	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/installer/release/lang/French.lng	2019-04-24 14:08:16 UTC (rev 7613)
@@ -1,4 +1,4 @@
-; Updated by TeraTerm Project (2019-02-28)
+; Updated by TeraTerm Project (2019-04-22)
 ; 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...
@@ -594,6 +596,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.
 

Modified: branches/ssh_auth_dialog/installer/release/lang/German.lng
===================================================================
--- branches/ssh_auth_dialog/installer/release/lang/German.lng	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/installer/release/lang/German.lng	2019-04-24 14:08:16 UTC (rev 7613)
@@ -1,4 +1,4 @@
-; Updated by TeraTerm Project (2019-02-28)
+; Updated by TeraTerm Project (2019-04-22)
 ; 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
@@ -594,6 +596,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.
 

Modified: branches/ssh_auth_dialog/installer/release/lang/Japanese.lng
===================================================================
--- branches/ssh_auth_dialog/installer/release/lang/Japanese.lng	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/installer/release/lang/Japanese.lng	2019-04-24 14:08:16 UTC (rev 7613)
@@ -1,4 +1,4 @@
-; Updated by TeraTerm Project (2019-02-28)
+; Updated by TeraTerm Project (2019-04-22)
 
 [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...
@@ -591,6 +593,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.
 

Modified: branches/ssh_auth_dialog/installer/release/lang/Korean.lng
===================================================================
--- branches/ssh_auth_dialog/installer/release/lang/Korean.lng	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/installer/release/lang/Korean.lng	2019-04-24 14:08:16 UTC (rev 7613)
@@ -1,4 +1,4 @@
-; Updated by TeraTerm Project (2019-02-28)
+; Updated by TeraTerm Project (2019-04-22)
 ; 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...
@@ -594,6 +596,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.
 

Modified: branches/ssh_auth_dialog/installer/release/lang/Russian.lng
===================================================================
--- branches/ssh_auth_dialog/installer/release/lang/Russian.lng	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/installer/release/lang/Russian.lng	2019-04-24 14:08:16 UTC (rev 7613)
@@ -1,4 +1,4 @@
-; Updated by TeraTerm Project (2019-02-28)
+; Updated by TeraTerm Project (2019-04-22)
 ; 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...
@@ -594,6 +596,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.
 

Modified: branches/ssh_auth_dialog/installer/release/lang/Simplified Chinese.lng
===================================================================
--- branches/ssh_auth_dialog/installer/release/lang/Simplified Chinese.lng	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/installer/release/lang/Simplified Chinese.lng	2019-04-24 14:08:16 UTC (rev 7613)
@@ -1,4 +1,4 @@
-; Updated by TeraTerm Project (2019-02-28)
+; Updated by TeraTerm Project (2019-04-22)
 ; 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...
@@ -594,6 +596,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Կ
 

Modified: branches/ssh_auth_dialog/installer/release/lang/Traditional Chinese.lng
===================================================================
--- branches/ssh_auth_dialog/installer/release/lang/Traditional Chinese.lng	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/installer/release/lang/Traditional Chinese.lng	2019-04-24 14:08:16 UTC (rev 7613)
@@ -1,4 +1,4 @@
-; Updated by TeraTerm Project (2019-02-28)
+; Updated by TeraTerm Project (2019-04-22)
 ; 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...
@@ -594,6 +596,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_
 

Modified: branches/ssh_auth_dialog/installer/teraterm.iss
===================================================================
--- branches/ssh_auth_dialog/installer/teraterm.iss	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/installer/teraterm.iss	2019-04-24 14:08:16 UTC (rev 7613)
@@ -67,7 +67,6 @@
 [Files]
 Source: ..\teraterm\release\ttermpro.exe; DestDir: {app}; Components: TeraTerm; Flags: ignoreversion
 Source: ..\teraterm\release\ttpcmn.dll; DestDir: {app}; Components: TeraTerm; Flags: ignoreversion
-Source: ..\teraterm\release\ttpdlg.dll; DestDir: {app}; Components: TeraTerm; Flags: ignoreversion
 Source: ..\teraterm\release\ttpfile.dll; DestDir: {app}; Components: TeraTerm; Flags: ignoreversion
 Source: ..\teraterm\release\ttpset.dll; DestDir: {app}; Components: TeraTerm; Flags: ignoreversion
 Source: ..\teraterm\release\ttptek.dll; DestDir: {app}; Components: TeraTerm; Flags: ignoreversion
@@ -963,6 +962,7 @@
 Name: {app}\copyfont.pif; Type: files
 Name: {app}\libeay.txt; Type: files
 Name: {app}\cygterm+-x86_64\cyglaunch.exe; Type: files
+Name: {app}\ttpdlg.dll; Type: files
 
 [UninstallDelete]
 Name: {app}\cygterm.exe; Type: files

Modified: branches/ssh_auth_dialog/libs/SFMT.cmake
===================================================================
--- branches/ssh_auth_dialog/libs/SFMT.cmake	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/libs/SFMT.cmake	2019-04-24 14:08:16 UTC (rev 7613)
@@ -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/ssh_auth_dialog/libs/build_library_with_cmake.md
===================================================================
--- branches/ssh_auth_dialog/libs/build_library_with_cmake.md	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/libs/build_library_with_cmake.md	2019-04-24 14:08:16 UTC (rev 7613)
@@ -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/ssh_auth_dialog/libs/buildall.cmake
===================================================================
--- branches/ssh_auth_dialog/libs/buildall.cmake	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/libs/buildall.cmake	2019-04-24 14:08:16 UTC (rev 7613)
@@ -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/ssh_auth_dialog/libs/buildall_cmake.bat
===================================================================
--- branches/ssh_auth_dialog/libs/buildall_cmake.bat	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/libs/buildall_cmake.bat	2019-04-24 14:08:16 UTC (rev 7613)
@@ -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/ssh_auth_dialog/libs/oniguruma.cmake
===================================================================
--- branches/ssh_auth_dialog/libs/oniguruma.cmake	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/libs/oniguruma.cmake	2019-04-24 14:08:16 UTC (rev 7613)
@@ -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/ssh_auth_dialog/libs/openssl.cmake
===================================================================
--- branches/ssh_auth_dialog/libs/openssl.cmake	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/libs/openssl.cmake	2019-04-24 14:08:16 UTC (rev 7613)
@@ -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/ssh_auth_dialog/libs/script_support.cmake
===================================================================
--- branches/ssh_auth_dialog/libs/script_support.cmake	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/libs/script_support.cmake	2019-04-24 14:08:16 UTC (rev 7613)
@@ -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/ssh_auth_dialog/libs/zlib.cmake
===================================================================
--- branches/ssh_auth_dialog/libs/zlib.cmake	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/libs/zlib.cmake	2019-04-24 14:08:16 UTC (rev 7613)
@@ -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/ssh_auth_dialog/teraterm/CMakeLists.txt
===================================================================
--- branches/ssh_auth_dialog/teraterm/CMakeLists.txt	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/teraterm/CMakeLists.txt	2019-04-24 14:08:16 UTC (rev 7613)
@@ -4,11 +4,6 @@
   ttpcmn
   PROPERTIES FOLDER teraterm)
 
-add_subdirectory(ttpdlg)
-set_target_properties(
-  ttpdlg
-  PROPERTIES FOLDER teraterm)
-
 add_subdirectory(ttpfile)
 set_target_properties(
   ttpfile
@@ -19,10 +14,13 @@
   ttpset
   PROPERTIES FOLDER teraterm)
 
-add_subdirectory(ttpmacro)
-set_target_properties(
-  ttpmacro
-  PROPERTIES FOLDER teraterm)
+#if((NOT(${CMAKE_GENERATOR} MATCHES "Visual Studio 8 2005" AND ${CMAKE_MAKE_PROGRAM} MATCHES "VCExpress.exe")) AND (NOT(MINGW)))
+  # MFCを使用しているため VS2005 Express ではビルドできない
+  add_subdirectory(ttpmacro)
+  set_target_properties(
+    ttpmacro
+    PROPERTIES FOLDER teraterm)
+#endif()
 
 add_subdirectory(ttptek)
 set_target_properties(
@@ -38,6 +36,3 @@
 set_target_properties(
   keycode
   PROPERTIES FOLDER teraterm)
-
-# ttpdlg内でconfig時 svnversion.h を生成
-#add_subdirectory(svnrev)

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

Modified: branches/ssh_auth_dialog/teraterm/common/dlglib.h
===================================================================
--- branches/ssh_auth_dialog/teraterm/common/dlglib.h	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/teraterm/common/dlglib.h	2019-04-24 14:08:16 UTC (rev 7613)
@@ -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/ssh_auth_dialog/teraterm/common/dlglib_cpp.cpp
===================================================================
--- branches/ssh_auth_dialog/teraterm/common/dlglib_cpp.cpp	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/teraterm/common/dlglib_cpp.cpp	2019-04-24 14:08:16 UTC (rev 7613)
@@ -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,8 +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
 
@@ -240,3 +248,82 @@
 		hInstance, lpTemplateName,
 		hWndParent, lpDialogFunc, (LPARAM)NULL);
 }
+
+/**
+ *	\x8Eg\x97p\x82\xB7\x82\xE9\x83_\x83C\x83A\x83\x8D\x83O\x83t\x83H\x83\x93\x83g\x82\xF0\x8C\x88\x92肷\x82\xE9
+ */
+void SetDialogFont(const char *SetupFName,
+				   const char *UILanguageFile, const char *Section, const char *Key)
+{
+	LOGFONTA logfont;
+	BOOL result;
+
+	// teraterm.ini\x82̎w\x92\xE8
+	if (SetupFName != NULL) {
+		result = GetI18nLogfont("Tera Term", "DlgFont", &logfont, 0, SetupFName);
+		if (result == TRUE) {
+			result = IsExistFontA(logfont.lfFaceName, logfont.lfCharSet, TRUE);
+			if (result == TRUE) {
+				TTSetDlgFontA(logfont.lfFaceName, logfont.lfHeight, logfont.lfCharSet);
+				return;
+			}
+		}
+	}
+
+	// .lng\x82̎w\x92\xE8
+	if (UILanguageFile != NULL && Section != NULL && Key != NULL) {
+#if 0
+		static const char *dlg_font_keys[] = {
+			"DLG_FONT",
+			"DLG_TAHOMA_FONT",
+			"DLG_SYSTEM_FONT",
+		};
+#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;
+			}
+		}
+	}
+
+	// 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
+	// messagebox()\x82̃t\x83H\x83\x93\x83g\x82\xF0\x82Ƃ肠\x82\xA6\x82\xB8\x91I\x91\xF0\x82\xB5\x82Ă\xA8\x82\xAD
+	GetMessageboxFont(&logfont);
+	if (logfont.lfHeight < 0) {
+		logfont.lfHeight = GetFontPointFromPixel(NULL, -logfont.lfHeight);
+	}
+	TTSetDlgFont(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/ssh_auth_dialog/teraterm/common/dlglib_tmpl.cpp
===================================================================
--- branches/ssh_auth_dialog/teraterm/common/dlglib_tmpl.cpp	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/teraterm/common/dlglib_tmpl.cpp	2019-04-24 14:08:16 UTC (rev 7613)
@@ -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 {

Modified: branches/ssh_auth_dialog/teraterm/common/dllutil.cpp
===================================================================
--- branches/ssh_auth_dialog/teraterm/common/dllutil.cpp	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/teraterm/common/dllutil.cpp	2019-04-24 14:08:16 UTC (rev 7613)
@@ -37,6 +37,7 @@
 #define malloc(l)     _malloc_dbg((l), _NORMAL_BLOCK, __FILE__, __LINE__)
 #define free(p)       _free_dbg((p), _NORMAL_BLOCK)
 #define _strdup(s)	  _strdup_dbg((s), _NORMAL_BLOCK, __FILE__, __LINE__)
+#define	realloc(p, l) _realloc_dbg((p), (l),  _NORMAL_BLOCK, __FILE__, __LINE__)
 #endif
 
 typedef struct {

Modified: branches/ssh_auth_dialog/teraterm/common/i18n.c
===================================================================
--- branches/ssh_auth_dialog/teraterm/common/i18n.c	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/teraterm/common/i18n.c	2019-04-24 14:08:16 UTC (rev 7613)
@@ -47,7 +47,7 @@
 }
 #endif
 
-void GetI18nStr(const char *section, const char *key, PCHAR buf, int buf_len, const char *def, const char *iniFile)
+DllExport void GetI18nStr(const char *section, const char *key, PCHAR buf, int buf_len, const char *def, const char *iniFile)
 {
 	GetPrivateProfileStringA(section, key, def, buf, buf_len, iniFile);
 	RestoreNewLine(buf);

Modified: branches/ssh_auth_dialog/teraterm/common/i18n.h
===================================================================
--- branches/ssh_auth_dialog/teraterm/common/i18n.h	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/teraterm/common/i18n.h	2019-04-24 14:08:16 UTC (rev 7613)
@@ -37,6 +37,10 @@
 extern "C" {
 #endif
 
+#if !defined(DllExport)
+#define DllExport __declspec(dllexport)
+#endif
+
 typedef struct {
 	int nIDDlgItem;
 	const char *key;
@@ -43,13 +47,13 @@
 } DlgTextInfo;
 
 #if defined(UNICODE)
-void GetI18nStrW(const char *section, const char *key, wchar_t *buf, int buf_len, const wchar_t *def, const char *iniFile);
+DllExport void GetI18nStrW(const char *section, const char *key, wchar_t *buf, int buf_len, const wchar_t *def, const char *iniFile);
 #endif
-void GetI18nStr(const char *section, const char *key, PCHAR buf, int buf_len, const char *def, const char *iniFile);
-int GetI18nLogfont(const char *section, const char *key, PLOGFONTA logfont, int ppi, const char *iniFile);
-void SetI18DlgStrs(const char *section, HWND hDlgWnd,
+DllExport void GetI18nStr(const char *section, const char *key, PCHAR buf, int buf_len, const char *def, const char *iniFile);
+DllExport int GetI18nLogfont(const char *section, const char *key, PLOGFONTA logfont, int ppi, const char *iniFile);
+DllExport void SetI18DlgStrs(const char *section, HWND hDlgWnd,
 							 const DlgTextInfo *infos, size_t infoCount, const char *UILanguageFile);
-void SetI18MenuStrs(const char *section, HMENU hMenu,
+DllExport void SetI18MenuStrs(const char *section, HMENU hMenu,
 							  const DlgTextInfo *infos, size_t infoCount, const char *UILanguageFile);
 
 #if defined(_UNICODE)

Modified: branches/ssh_auth_dialog/teraterm/common/servicenames.h
===================================================================
--- branches/ssh_auth_dialog/teraterm/common/servicenames.h	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/teraterm/common/servicenames.h	2019-04-24 14:08:16 UTC (rev 7613)
@@ -32,10 +32,13 @@
 extern "C" {
 #endif
 
+#if !defined(DllExport)
+#define DllExport __declspec(dllexport)
+#endif
 /* proto types */
-int PASCAL parse_port(char *str, char *buf, int bufsize);
-int PASCAL parse_port_from_buf(char *buf);
-char * PASCAL service_name(int num);
+DllExport int PASCAL parse_port(char *str, char *buf, int bufsize);
+DllExport int PASCAL parse_port_from_buf(char *buf);
+DllExport char * PASCAL service_name(int num);
 
 #ifdef __cplusplus
 }

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

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

Added: branches/ssh_auth_dialog/teraterm/common/teraterm_conf.h
===================================================================
--- branches/ssh_auth_dialog/teraterm/common/teraterm_conf.h	                        (rev 0)
+++ branches/ssh_auth_dialog/teraterm/common/teraterm_conf.h	2019-04-24 14:08:16 UTC (rev 7613)
@@ -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/ssh_auth_dialog/teraterm/common/tipwin.cpp
===================================================================
--- branches/ssh_auth_dialog/teraterm/common/tipwin.cpp	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/teraterm/common/tipwin.cpp	2019-04-24 14:08:16 UTC (rev 7613)
@@ -58,9 +58,10 @@
 #include <windows.h>
 #include <stdio.h>
 #include <tchar.h>
-#include <commctrl.h>	// for CCSIZEOF_STRUCT()
 #include <assert.h>
 
+#include "ttlib.h"		// for GetMessageboxFont()
+
 #include "TipWin.h"
 
 #define	FRAME_WIDTH	6
@@ -190,20 +191,6 @@
 	return DefWindowProc(hWnd, nMsg, wParam, lParam);
 }
 
-// todo: dlglib.c\x82ɓ\xAF\x93\x99\x82ȃR\x81[\x83h\x82\xA0\x82\xE8
-void GetMessageboxFont(LOGFONT *logfont)
-{
-	NONCLIENTMETRICS nci;
-	const int st_size = CCSIZEOF_STRUCT(NONCLIENTMETRICS, lfMessageFont);
-	BOOL r;
-
-	memset(&nci, 0, sizeof(nci));
-	nci.cbSize = st_size;
-	r = SystemParametersInfo(SPI_GETNONCLIENTMETRICS, st_size, &nci, 0);
-	assert(r == TRUE);
-	*logfont = nci.lfStatusFont;
-}
-
 static void register_class(HINSTANCE hInst)
 {
 	if (!tip_class) {

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

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

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

Modified: branches/ssh_auth_dialog/teraterm/common/tt_res.h
===================================================================
--- branches/ssh_auth_dialog/teraterm/common/tt_res.h	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/teraterm/common/tt_res.h	2019-04-24 14:08:16 UTC (rev 7613)
@@ -289,6 +289,7 @@
 #define ID_SETUP_TERMINAL               50310
 #define ID_SETUP_WINDOW                 50320
 #define ID_SETUP_FONT                   50330
+#define ID_SETUP_DLG_FONT               50331
 #define ID_SETUP_KEYBOARD               50340
 #define ID_SETUP_SERIALPORT             50350
 #define ID_SETUP_TCPIP                  50360

Modified: branches/ssh_auth_dialog/teraterm/common/ttcommon.h
===================================================================
--- branches/ssh_auth_dialog/teraterm/common/ttcommon.h	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/teraterm/common/ttcommon.h	2019-04-24 14:08:16 UTC (rev 7613)
@@ -34,72 +34,71 @@
 extern "C" {
 #endif
 
-int PASCAL DetectComPorts(LPWORD ComPortTable, int ComPortMax, char **ComPortDesc);
-int PASCAL CheckComPort(WORD ComPort);
-void PASCAL CopyShmemToTTSet(PTTSet ts);
-void PASCAL CopyTTSetToShmem(PTTSet ts);
-BOOL PASCAL StartTeraTerm(PTTSet ts);
-void PASCAL RestartTeraTerm(HWND hwnd, PTTSet ts);
-void PASCAL ChangeDefaultSet(PTTSet ts, PKeyMap km);
-void PASCAL GetDefaultSet(PTTSet ts);
+#if !defined(DllExport)
+#define DllExport __declspec(dllimport)
+#endif
+
+DllExport int PASCAL DetectComPorts(LPWORD ComPortTable, int ComPortMax, char **ComPortDesc);
+DllExport int PASCAL CheckComPort(WORD ComPort);
+DllExport void PASCAL CopyShmemToTTSet(PTTSet ts);
+DllExport void PASCAL CopyTTSetToShmem(PTTSet ts);
+DllExport BOOL PASCAL StartTeraTerm(PTTSet ts);
+DllExport void PASCAL RestartTeraTerm(HWND hwnd, PTTSet ts);
+DllExport void PASCAL ChangeDefaultSet(PTTSet ts, PKeyMap km);
+DllExport void PASCAL GetDefaultSet(PTTSet ts);
 // void PASCAL LoadDefaultSet(PCHAR SetupFName);
-WORD PASCAL GetKeyCode(PKeyMap KeyMap, WORD Scan);
-void PASCAL GetKeyStr(HWND HWin, PKeyMap KeyMap, WORD KeyCode,
+DllExport WORD PASCAL GetKeyCode(PKeyMap KeyMap, WORD Scan);
+DllExport void PASCAL GetKeyStr(HWND HWin, PKeyMap KeyMap, WORD KeyCode,
                           BOOL AppliKeyMode, BOOL AppliCursorMode,
                           BOOL Send8BitMode, PCHAR KeyStr,
                           int destlen, LPINT Len, LPWORD Type);
 
-void PASCAL SetCOMFlag(int com);
-void PASCAL ClearCOMFlag(int com);
-int PASCAL CheckCOMFlag(int com);
+DllExport void PASCAL SetCOMFlag(int com);
+DllExport void PASCAL ClearCOMFlag(int com);
+DllExport int PASCAL CheckCOMFlag(int com);
 
-int PASCAL RegWin(HWND HWinVT, HWND HWinTEK);
-void PASCAL UnregWin(HWND HWin);
-void PASCAL SetWinMenu(HMENU menu, PCHAR buf, int buflen, PCHAR langFile, int VTFlag);
-void PASCAL SetWinList(HWND HWin, HWND HDlg, int IList);
-void PASCAL SelectWin(int WinId);
-void PASCAL SelectNextWin(HWND HWin, int Next, BOOL SkipIconic);
-HWND PASCAL GetNthWin(int n);
-int PASCAL GetRegisteredWindowCount();
-void PASCAL ShowAllWin(int stat);
-void PASCAL ShowAllWinSidebySide(HWND);
-void PASCAL ShowAllWinStacked(HWND);
-void PASCAL ShowAllWinCascade(HWND);
-void PASCAL BroadcastClosingMessage(HWND myhwnd);
-void PASCAL UndoAllWin();
-void PASCAL OpenHelp(UINT Command, DWORD Data, char *UILanguageFile);
+DllExport int PASCAL RegWin(HWND HWinVT, HWND HWinTEK);
+DllExport void PASCAL UnregWin(HWND HWin);
+DllExport void PASCAL SetWinMenu(HMENU menu, PCHAR buf, int buflen, PCHAR langFile, int VTFlag);
+DllExport void PASCAL SetWinList(HWND HWin, HWND HDlg, int IList);
+DllExport void PASCAL SelectWin(int WinId);
+DllExport void PASCAL SelectNextWin(HWND HWin, int Next, BOOL SkipIconic);
+DllExport HWND PASCAL GetNthWin(int n);
+DllExport int PASCAL GetRegisteredWindowCount();
+DllExport void PASCAL ShowAllWin(int stat);
+DllExport void PASCAL ShowAllWinSidebySide(HWND);
+DllExport void PASCAL ShowAllWinStacked(HWND);
+DllExport void PASCAL ShowAllWinCascade(HWND);
+DllExport void PASCAL BroadcastClosingMessage(HWND myhwnd);
+DllExport void PASCAL UndoAllWin();
+DllExport void PASCAL OpenHelp(UINT Command, DWORD Data, char *UILanguageFile);
 
-int PASCAL CommReadRawByte(PComVar cv, LPBYTE b);
-int PASCAL CommRead1Byte(PComVar cv, LPBYTE b);
-void PASCAL CommInsert1Byte(PComVar cv, BYTE b);
-int PASCAL CommRawOut(PComVar cv, PCHAR B, int C);
-int PASCAL CommBinaryOut(PComVar cv, PCHAR B, int C);
-int PASCAL CommBinaryBuffOut(PComVar cv, PCHAR B, int C);
-int PASCAL CommTextOut(PComVar cv, PCHAR B, int C);
-int PASCAL CommTextOutW(PComVar cv, const wchar_t *B, int C);
-int PASCAL CommBinaryEcho(PComVar cv, PCHAR B, int C);
-int PASCAL CommTextEcho(PComVar cv, PCHAR B, int C);
-int PASCAL CommTextEchoW(PComVar cv, const wchar_t *B, int C);
+DllExport int PASCAL CommReadRawByte(PComVar cv, LPBYTE b);
+DllExport int PASCAL CommRead1Byte(PComVar cv, LPBYTE b);
+DllExport void PASCAL CommInsert1Byte(PComVar cv, BYTE b);
+DllExport int PASCAL CommRawOut(PComVar cv, PCHAR B, int C);
+DllExport int PASCAL CommBinaryOut(PComVar cv, PCHAR B, int C);
+DllExport int PASCAL CommBinaryBuffOut(PComVar cv, PCHAR B, int C);
+DllExport int PASCAL CommTextOut(PComVar cv, PCHAR B, int C);
+DllExport int PASCAL CommTextOutW(PComVar cv, const wchar_t *B, int C);
+DllExport int PASCAL CommBinaryEcho(PComVar cv, PCHAR B, int C);
+DllExport int PASCAL CommTextEcho(PComVar cv, PCHAR B, int C);
+DllExport int PASCAL CommTextEchoW(PComVar cv, const wchar_t *B, int C);
 
-void PASCAL CreateNotifyIcon(PComVar cv);
-void PASCAL DeleteNotifyIcon(PComVar cv);
-void PASCAL NotifyMessage(PComVar cv, PCHAR message, PCHAR title, DWORD flag);
-void PASCAL ShowNotifyIcon(PComVar cv);
-void PASCAL HideNotifyIcon(PComVar cv);
-void PASCAL SetVerNotifyIcon(PComVar cv, unsigned int ver);
-void PASCAL SetCustomNotifyIcon(HICON icon);
-HICON PASCAL GetCustomNotifyIcon();
+DllExport void PASCAL CreateNotifyIcon(PComVar cv);
+DllExport void PASCAL DeleteNotifyIcon(PComVar cv);
+DllExport void PASCAL NotifyMessage(PComVar cv, PCHAR message, PCHAR title, DWORD flag);
+DllExport void PASCAL ShowNotifyIcon(PComVar cv);
+DllExport void PASCAL HideNotifyIcon(PComVar cv);
+DllExport void PASCAL SetVerNotifyIcon(PComVar cv, unsigned int ver);
+DllExport void PASCAL SetCustomNotifyIcon(HICON icon);
+DllExport HICON PASCAL GetCustomNotifyIcon();
 
 #define NotifyInfoMessage(cv, msg, title) NotifyMessage(cv, msg, title, 1)
 #define NotifyWarnMessage(cv, msg, title) NotifyMessage(cv, msg, title, 2)
 #define NotifyErrorMessage(cv, msg, title) NotifyMessage(cv, msg, title, 3)
 
-WORD PASCAL SJIS2JIS(WORD KCode);
-WORD PASCAL SJIS2EUC(WORD KCode);
-WORD PASCAL JIS2SJIS(WORD KCode);
-BYTE PASCAL RussConv(int cin, int cout, BYTE b);
-void PASCAL RussConvStr
-  (int cin, int cout, PCHAR Str, int count);
+#include "../ttpcmn/language.h"
 
 #ifdef __cplusplus
 }

Modified: branches/ssh_auth_dialog/teraterm/common/ttftypes.h
===================================================================
--- branches/ssh_auth_dialog/teraterm/common/ttftypes.h	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/teraterm/common/ttftypes.h	2019-04-24 14:08:16 UTC (rev 7613)
@@ -133,7 +133,7 @@
   DWORD StartTime;
 
   // log rotate
-  enum rotate_mode RotateMode;
+  int RotateMode;  //  enum rotate_mode RotateMode;
   LONG RotateSize;
   int RotateStep;
 

Modified: branches/ssh_auth_dialog/teraterm/common/ttlib.c
===================================================================
--- branches/ssh_auth_dialog/teraterm/common/ttlib.c	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/teraterm/common/ttlib.c	2019-04-24 14:08:16 UTC (rev 7613)
@@ -28,18 +28,21 @@
  */
 
 /* misc. routines  */
-#include "teraterm.h"
+
 #include <sys/stat.h>
 #include <sys/utime.h>
 #include <string.h>
 #include <time.h>
 #include <stdio.h>
-#include "tttypes.h"
 #include <shlobj.h>
 #include <ctype.h>
+#include <mbctype.h>	// for _ismbblead
+#include <assert.h>
 
-// for _ismbblead
-#include <mbctype.h>
+#include "teraterm_conf.h"
+#include "teraterm.h"
+#include "tttypes.h"
+#include "compat_win.h"
 
 /* OS version with GetVersionEx(*1)
 
@@ -1435,17 +1438,10 @@
 // OPENFILENAMEA.lStructSize \x82ɑ\xE3\x93\xFC\x82\xB7\x82\xE9\x92l
 DWORD get_OPENFILENAME_SIZE()
 {
-#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
 }
 
 // convert table for KanjiCodeID and ListID
@@ -1805,3 +1801,84 @@
 {
 	SetI18MenuStrs("Tera Term", hMenu, infos, infoCount, UILanguageFile);
 }
+
+/**
+ *	\x83_\x83C\x83A\x83\x8D\x83O\x83t\x83H\x83\x93\x83g\x82\xF0\x8E擾\x82\xB7\x82\xE9
+ *	\x83G\x83\x89\x81[\x82͔\xAD\x90\xB6\x82\xB5\x82Ȃ\xA2
+ */
+void GetMessageboxFont(LOGFONT *logfont)
+{
+	NONCLIENTMETRICS nci;
+	const int st_size = CCSIZEOF_STRUCT(NONCLIENTMETRICS, lfMessageFont);
+	BOOL r;
+
+	memset(&nci, 0, sizeof(nci));
+	nci.cbSize = st_size;
+	r = SystemParametersInfo(SPI_GETNONCLIENTMETRICS, st_size, &nci, 0);
+	assert(r == TRUE);
+	*logfont = nci.lfStatusFont;
+}
+
+/**
+ *	\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/ssh_auth_dialog/teraterm/common/ttlib.h
===================================================================
--- branches/ssh_auth_dialog/teraterm/common/ttlib.h	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/teraterm/common/ttlib.h	2019-04-24 14:08:16 UTC (rev 7613)
@@ -37,9 +37,13 @@
 extern "C" {
 #endif
 
+#if !defined(DllExport)
+#define DllExport __declspec(dllexport)
+#endif
+
 BOOL GetFileNamePos(PCHAR PathName, int far *DirLen, int far *FNPos);
-BOOL ExtractFileName(PCHAR PathName, PCHAR FileName, int destlen);
-BOOL ExtractDirName(PCHAR PathName, PCHAR DirName);
+DllExport BOOL ExtractFileName(PCHAR PathName, PCHAR FileName, int destlen);
+DllExport BOOL ExtractDirName(PCHAR PathName, PCHAR DirName);
 void FitFileName(PCHAR FileName, int destlen, const char *DefExt);
 void AppendSlash(PCHAR Path, int destlen);
 void DeleteSlash(PCHAR Path);
@@ -57,7 +61,7 @@
 #endif
 int isInvalidFileNameChar(PCHAR FName);
 #define deleteInvalidFileNameChar(name) replaceInvalidFileNameChar(name, 0)
-void replaceInvalidFileNameChar(PCHAR FName, unsigned char c);
+DllExport void replaceInvalidFileNameChar(PCHAR FName, unsigned char c);
 int isInvalidStrftimeChar(PCHAR FName);
 void deleteInvalidStrftimeChar(PCHAR FName);
 void ParseStrftimeFileName(PCHAR FName, int destlen);
@@ -76,32 +80,33 @@
 void get_lang_msgW(const char *key, wchar_t *buf, int buf_len, const wchar_t *def, const char *iniFile);
 #endif
 int get_lang_font(PCHAR key, HWND dlg, PLOGFONT logfont, HFONT *font, const char *iniFile);
-BOOL doSelectFolder(HWND hWnd, char *path, int pathlen, const char *def, const char *msg);
-void OutputDebugPrintf(const char *fmt, ...);
-DWORD get_OPENFILENAME_SIZEA();
-BOOL IsWindows95();
-BOOL IsWindowsMe();
-BOOL IsWindowsNT4();
-BOOL IsWindowsNTKernel();
-BOOL IsWindows2000();
-BOOL IsWindows2000OrLater();
-BOOL IsWindowsVistaOrLater();
-BOOL IsWindows7OrLater();
-BOOL HasMultiMonitorSupport();
-BOOL HasGetAdaptersAddresses();
-BOOL HasDnsQuery();
-BOOL HasBalloonTipSupport();
+DllExport BOOL doSelectFolder(HWND hWnd, char *path, int pathlen, const char *def, const char *msg);
+DllExport void OutputDebugPrintf(const char *fmt, ...);
+DllExport DWORD get_OPENFILENAME_SIZEA();
+DllExport DWORD get_OPENFILENAME_SIZEW();
+DllExport BOOL IsWindows95();
+DllExport BOOL IsWindowsMe();
+DllExport BOOL IsWindowsNT4();
+DllExport BOOL IsWindowsNTKernel();
+DllExport BOOL IsWindows2000();
+DllExport BOOL IsWindows2000OrLater();
+DllExport BOOL IsWindowsVistaOrLater();
+DllExport BOOL IsWindows7OrLater();
+DllExport BOOL HasMultiMonitorSupport();
+DllExport BOOL HasGetAdaptersAddresses();
+DllExport BOOL HasDnsQuery();
+DllExport BOOL HasBalloonTipSupport();
 int KanjiCode2List(int lang, int kcode);
 int List2KanjiCode(int lang, int kcode);
 int KanjiCodeTranslate(int lang, int kcode);
-char *mctimelocal(char *format, BOOL utc_flag);
+DllExport char *mctimelocal(char *format, BOOL utc_flag);
 char *strelapsed(DWORD start_time);
 
 void b64encode(PCHAR dst, int dsize, PCHAR src, int len);
-int b64decode(PCHAR dst, int dsize, PCHAR src);
+DllExport int b64decode(PCHAR dst, int dsize, PCHAR src);
 
-PCHAR PASCAL GetParam(PCHAR buff, int size, PCHAR param);
-void PASCAL DequoteParam(PCHAR dest, int dest_len, PCHAR src);
+DllExport PCHAR PASCAL GetParam(PCHAR buff, int size, PCHAR param);
+DllExport void PASCAL DequoteParam(PCHAR dest, int dest_len, PCHAR src);
 void PASCAL DeleteComment(PCHAR dest, int dest_size, PCHAR src);
 
 void split_buffer(char *buffer, int delimiter, char **head, char **body);
@@ -108,17 +113,25 @@
 BOOL GetPositionOnWindow(
 	HWND hWnd, const POINT *point,
 	BOOL *InWindow, BOOL *InClient, BOOL *InTitleBar);
+DllExport void GetMessageboxFont(LOGFONTA *logfont);
+void GetDesktopRect(HWND hWnd, RECT *rect);
+void CenterWindow(HWND hWnd, HWND hWndParent);
 
 #define CheckFlag(var, flag)	(((var) & (flag)) != 0)
 
 void SetDlgTexts(HWND hDlgWnd, const DlgTextInfo *infos, int infoCount, const char *UILanguageFile);
+void SetDlgMenuTexts(HMENU hMenu, const DlgTextInfo *infos, int infoCount, const char *UILanguageFile);
+
 #if defined(_UNICODE)
+#define	doSelectFolderT(p1, p2, p3, p4, p5) doSelectFolderW(p1, p2, p3, p4, p5)
 #define	get_lang_msgT(p1, p2, p3, p4, p5) get_lang_msgW(p1, p2, p3, p4, p5)
 #define	get_OPENFILENAME_SIZE() get_OPENFILENAME_SIZEW()
 #else
+#define	doSelectFolderT(p1, p2, p3, p4, p5) doSelectFolder(p1, p2, p3, p4, p5)
 #define	get_lang_msgT(p1, p2, p3, p4, p5) get_lang_msg(p1, p2, p3, p4, p5)
 #define	get_OPENFILENAME_SIZE() get_OPENFILENAME_SIZEA()
 #endif
+
 #ifdef __cplusplus
 }
 #endif

Modified: branches/ssh_auth_dialog/teraterm/common/tttypes.h
===================================================================
--- branches/ssh_auth_dialog/teraterm/common/tttypes.h	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/teraterm/common/tttypes.h	2019-04-24 14:08:16 UTC (rev 7613)
@@ -644,7 +644,7 @@
 	WORD FontQuality;
 	char ScpSendDir[MAXPATHLEN];
 	char BGImageFilePath[MAX_PATH];
-	enum rotate_mode LogRotate;
+	int LogRotate;		//	enum rotate_mode LogRotate;
 	DWORD LogRotateSize;
 	WORD LogRotateSizeType;
 	WORD LogRotateStep;
@@ -1018,7 +1018,7 @@
 	BOOL Open;
 	WORD PortType;
 	WORD ComPort;
-	unsigned int s; /* SOCKET */
+	UINT_PTR s; /* SOCKET */
 	WORD RetryCount;
 	HANDLE ComID;
 	BOOL CanSend, RRQ;

Modified: branches/ssh_auth_dialog/teraterm/keycode/keycode.rc
===================================================================
--- branches/ssh_auth_dialog/teraterm/keycode/keycode.rc	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/teraterm/keycode/keycode.rc	2019-04-24 14:08:16 UTC (rev 7613)
@@ -1,6 +1,8 @@
 //Microsoft Developer Studio generated resource script.
 //
+#include <windows.h>
 #include "kc_res.h"
+#define IDC_STATIC 0
 
 #define APSTUDIO_READONLY_SYMBOLS
 /////////////////////////////////////////////////////////////////////////////

Copied: branches/ssh_auth_dialog/teraterm/keycode/keycode.v16.vcxproj (from rev 7520, branches/ssh_auth_dialog/teraterm/ttptek/ttptek.v14.vcxproj)
===================================================================
--- branches/ssh_auth_dialog/teraterm/keycode/keycode.v16.vcxproj	                        (rev 0)
+++ branches/ssh_auth_dialog/teraterm/keycode/keycode.v16.vcxproj	2019-04-24 14:08:16 UTC (rev 7613)
@@ -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/ssh_auth_dialog/teraterm/keycode/keycode.v16.vcxproj.filters
===================================================================
--- branches/ssh_auth_dialog/teraterm/keycode/keycode.v16.vcxproj.filters	                        (rev 0)
+++ branches/ssh_auth_dialog/teraterm/keycode/keycode.v16.vcxproj.filters	2019-04-24 14:08:16 UTC (rev 7613)
@@ -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>

Modified: branches/ssh_auth_dialog/teraterm/keycode/keycode.vcproj
===================================================================
--- branches/ssh_auth_dialog/teraterm/keycode/keycode.vcproj	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/teraterm/keycode/keycode.vcproj	2019-04-24 14:08:16 UTC (rev 7613)
@@ -68,6 +68,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalDependencies="User32.lib Gdi32.lib"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				SubSystem="2"
@@ -153,6 +154,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalDependencies="User32.lib Gdi32.lib"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				GenerateDebugInformation="true"

Deleted: branches/ssh_auth_dialog/teraterm/svnrev/CMakeLists.txt
===================================================================
--- branches/ssh_auth_dialog/teraterm/svnrev/CMakeLists.txt	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/teraterm/svnrev/CMakeLists.txt	2019-04-24 14:08:16 UTC (rev 7613)
@@ -1,23 +0,0 @@
-project(svnrev)
-
-set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/")
-
-set(SRC
-  svnrev.cpp
-  svnrev.h
-  )
-
-include_directories(
-  ../common
-  ../ttpfile
-  .
-  )
-
-add_executable(
-  svnrev
-  ${SRC}
-  )
-
-target_link_libraries(
-  svnrev
-  )

Copied: branches/ssh_auth_dialog/teraterm/svnrev/svnrev.v16.vcxproj (from rev 7520, branches/ssh_auth_dialog/TTXSamples/TTXViewMode/TTXViewMode.v14.vcxproj)
===================================================================
--- branches/ssh_auth_dialog/teraterm/svnrev/svnrev.v16.vcxproj	                        (rev 0)
+++ branches/ssh_auth_dialog/teraterm/svnrev/svnrev.v16.vcxproj	2019-04-24 14:08:16 UTC (rev 7613)
@@ -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/ssh_auth_dialog/teraterm/svnrev/svnrev.v16.vcxproj.filters
===================================================================
--- branches/ssh_auth_dialog/teraterm/svnrev/svnrev.v16.vcxproj.filters	                        (rev 0)
+++ branches/ssh_auth_dialog/teraterm/svnrev/svnrev.v16.vcxproj.filters	2019-04-24 14:08:16 UTC (rev 7613)
@@ -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/ssh_auth_dialog/teraterm/teraterm/CMakeLists.txt
===================================================================
--- branches/ssh_auth_dialog/teraterm/teraterm/CMakeLists.txt	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/teraterm/teraterm/CMakeLists.txt	2019-04-24 14:08:16 UTC (rev 7613)
@@ -34,6 +34,9 @@
   ../common/compat_w95.h
   ../common/compat_win.h
   ../common/compat_win.cpp
+  ../common/tmfc.cpp
+  ../common/tmfc.h
+  ../common/tmfc_frame.cpp
   ../common/i18n.h
   ../common/dllutil.cpp
   ../common/dllutil.h
@@ -53,6 +56,19 @@
   ${COMMON_SRC}
   )
 
+set(TTDLG_SRC
+  ../ttpdlg/dlg_res.h
+  ../ttpdlg/ttdlg.c
+  ../ttpdlg/ttdlg.h
+  ../ttpdlg/ttpdlg.rc
+  )
+
+source_group(
+  "ttdlg"
+  FILES
+  ${TTDLG_SRC}
+  )
+
 set(SRC
   addsetting.cpp
   addsetting.h
@@ -82,10 +98,10 @@
   tekwin.h
   telnet.c
   telnet.h
-  teraapp.h
   teraprn.cpp
   teraprn.h
   teraterm.cpp
+  teraterml.h
   ttdde.c
   ttdde.h
   ttdialog.c
@@ -119,16 +135,21 @@
   #
   teraterm.manifest
   #
+  svnversion.h.in
+  ${CMAKE_CURRENT_BINARY_DIR}/../ttpdlg/svnversion.h
+  #
   ${COMMON_SRC}
+  ${TTDLG_SRC}
   )
 
 include_directories(
   ../common
   ../ttpfile
+  ../ttpdlg
   ${SFMT_INCLUDE_DIRS}
   ${ONIGURUMA_INCLUDE_DIRS}
   .
-  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}/../ttpdlg
   )
 
 link_directories(
@@ -136,11 +157,7 @@
   ${SFMT_LIBRARY_DIRS}
   )
 
-set(CMAKE_MFC_FLAG 1)
-
 if (MSVC)
-  set(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} /NODEFAULTLIB:nafxcw.lib /NODEFAULTLIB:LIBCMT.lib")
-  set(CMAKE_EXE_LINKER_FLAGS_DEBUG "${CMAKE_EXE_LINKER_FLAGS_DEBUG} /NODEFAULTLIB:nafxcwd.lib /NODEFAULTLIB:LIBCMTD.lib")
   set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /DELAYLOAD:imagehlp.dll /DELAYLOAD:user32.dll /DELAYLOAD:shell32.dll")
 endif()
 
@@ -158,14 +175,9 @@
 target_link_libraries(
   teraterm
   ttpcmn
-  ttpdlg
   ttpfile
   ttpset
   ttptek
-  optimized nafxcw.lib
-  debug nafxcwd.lib
-  optimized LIBCMT.lib
-  debug LIBCMTD.lib
   optimized onig.lib
   debug onigd.lib
   #
@@ -180,7 +192,6 @@
 add_dependencies(
   teraterm
   ttpcmn
-  ttpdlg
   ttpfile
   ttpset
   ttptek
@@ -241,3 +252,8 @@
       "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}$(Configuration)/lang/Traditional Chinese.lng"
     )
 endif()
+
+####
+configure_file(
+  svnversion.h.in
+  ../ttpdlg/svnversion.h @ONLY)

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

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

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

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

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

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

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

Copied: branches/ssh_auth_dialog/teraterm/teraterm/svnversion.h.in (from rev 7520, branches/ssh_auth_dialog/teraterm/ttpdlg/svnversion.h.in)
===================================================================
--- branches/ssh_auth_dialog/teraterm/teraterm/svnversion.h.in	                        (rev 0)
+++ branches/ssh_auth_dialog/teraterm/teraterm/svnversion.h.in	2019-04-24 14:08:16 UTC (rev 7613)
@@ -0,0 +1 @@
+#cmakedefine SVNVERSION @SVNVERSION@

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

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

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

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

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

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

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

Modified: branches/ssh_auth_dialog/teraterm/teraterm/ttermpro.rc
===================================================================
--- branches/ssh_auth_dialog/teraterm/teraterm/ttermpro.rc	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/teraterm/teraterm/ttermpro.rc	2019-04-24 14:08:16 UTC (rev 7613)
@@ -1,6 +1,6 @@
 // Microsoft Visual C++ generated resource script.
 //
-#include "..\common\tt_res.h"
+#include "tt_res.h"
 
 #define APSTUDIO_READONLY_SYMBOLS
 /////////////////////////////////////////////////////////////////////////////
@@ -7,8 +7,8 @@
 //
 // Generated from the TEXTINCLUDE 2 resource.
 //
-#include "afxres.h"
-
+#include <winresrc.h>
+#define IDC_STATIC -1
 /////////////////////////////////////////////////////////////////////////////
 #undef APSTUDIO_READONLY_SYMBOLS
 
@@ -274,7 +274,6 @@
 
 IDD_FILETRANSDLG DIALOGEX 20, 20, 176, 96
 STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CLASS "FTDlg32"
 FONT 14, "System", 0, 0, 0x0
 BEGIN
     CONTROL         "Filename:",IDC_TRANS_FILENAME,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,15,12,38,10
@@ -462,13 +461,13 @@
 
 1 TEXTINCLUDE 
 BEGIN
-    "..\\common\\tt_res.h\0"
+    "tt_res.h\0"
 END
 
 2 TEXTINCLUDE 
 BEGIN
-    "#include ""afxres.h""\r\n"
-    "\0"
+    "#include <winresrc.h>\r\n"
+    "#define IDC_STATIC -1\0"
 END
 
 3 TEXTINCLUDE 
@@ -487,14 +486,14 @@
 
 // Icon with lowest ID value placed first to ensure application icon
 // remains consistent on all systems.
-IDI_TTERM               ICON                    "..\\common\\teraterm.ico"
-IDI_VT                  ICON                    "..\\common\\vt.ico"
-IDI_TEK                 ICON                    "..\\common\\tek.ico"
-IDI_TTERM_CLASSIC       ICON                    "..\\common\\teraterm_classic.ico"
-IDI_VT_CLASSIC          ICON                    "..\\common\\vt_classic.ico"
-IDI_TTERM_3D            ICON                    "..\\common\\teraterm_3d.ico"
-IDI_VT_3D               ICON                    "..\\common\\vt_3d.ico"
-IDI_CYGTERM             ICON                    "..\\..\\cygterm\\cygterm.ico"
+IDI_TTERM               ICON                    "../common/teraterm.ico"
+IDI_VT                  ICON                    "../common/vt.ico"
+IDI_TEK                 ICON                    "../common/tek.ico"
+IDI_TTERM_CLASSIC       ICON                    "../common/teraterm_classic.ico"
+IDI_VT_CLASSIC          ICON                    "../common/vt_classic.ico"
+IDI_TTERM_3D            ICON                    "../common/teraterm_3d.ico"
+IDI_VT_3D               ICON                    "../common/vt_3d.ico"
+IDI_CYGTERM             ICON                    "../../cygterm/cygterm.ico"
 
 /////////////////////////////////////////////////////////////////////////////
 //
@@ -578,7 +577,11 @@
     BEGIN
         MENUITEM "&Terminal...",                ID_SETUP_TERMINAL
         MENUITEM "&Window...",                  ID_SETUP_WINDOW
-        MENUITEM "&Font...",                    ID_SETUP_FONT
+		POPUP "&Font"
+        BEGIN
+			MENUITEM "&Font...",                ID_SETUP_FONT
+			MENUITEM "&Dialog Font...",         ID_SETUP_DLG_FONT
+	END
         MENUITEM "&Keyboard...",                ID_SETUP_KEYBOARD
         MENUITEM "S&erial port...",             ID_SETUP_SERIALPORT
         MENUITEM "T&CP/IP...",                  ID_SETUP_TCPIP

Modified: branches/ssh_auth_dialog/teraterm/teraterm/ttermpro.v10.vcxproj
===================================================================
--- branches/ssh_auth_dialog/teraterm/teraterm/ttermpro.v10.vcxproj	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/teraterm/teraterm/ttermpro.v10.vcxproj	2019-04-24 14:08:16 UTC (rev 7613)
@@ -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)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>Static</UseOfMfc>
+    <UseOfMfc>false</UseOfMfc>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>Static</UseOfMfc>
+    <UseOfMfc>false</UseOfMfc>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -63,7 +63,7 @@
     <ClCompile>
       <AdditionalOptions>/D"_CRT_SECURE_NO_DEPRECATE" %(AdditionalOptions)</AdditionalOptions>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(SolutionDir)common;$(SolutionDir)ttpfile;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\libs\oniguruma\src;$(SolutionDir)common;$(SolutionDir)ttpfile;$(SolutionDir)ttpdlg;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <BrowseInformation>
@@ -79,9 +79,9 @@
       <AdditionalIncludeDirectories>$(SolutionDir)common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>ws2_32.lib;imagehlp.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>onig_sd.lib;comctl32.lib;ws2_32.lib;imagehlp.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(SolutionDir)..\libs\oniguruma\src;$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <DelayLoadDLLs>imagehlp.dll;user32.dll;shell32.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
@@ -90,6 +90,10 @@
     <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>
@@ -105,7 +109,7 @@
       <AdditionalOptions>/D"_CRT_SECURE_NO_DEPRECATE" %(AdditionalOptions)</AdditionalOptions>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>$(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>
@@ -120,9 +124,9 @@
       <AdditionalIncludeDirectories>$(SolutionDir)common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>ws2_32.lib;imagehlp.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>onig_sd.lib;comctl32.lib;ws2_32.lib;imagehlp.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(SolutionDir)..\libs\oniguruma\src;$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <DelayLoadDLLs>imagehlp.dll;user32.dll;shell32.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
@@ -131,11 +135,19 @@
     <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\stdafx.cpp" />
+    <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" />
@@ -169,6 +181,8 @@
     <ClCompile Include="vtwin.cpp" />
     <ClCompile Include="winjump.c" />
     <ClCompile Include="WSAAsyncGetAddrInfo.c" />
+    <ClCompile Include="../ttpdlg/ttdlg.c" />
+    <ClInclude Include="../ttpdlg/ttdlg.h" />
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\cygterm\cygterm.ico" />
@@ -181,6 +195,7 @@
   <ItemGroup>
     <ResourceCompile Include="tt-version.rc" />
     <ResourceCompile Include="ttermpro.rc" />
+    <ResourceCompile Include="../ttpdlg/ttpdlg.rc" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="addsetting.h" />
@@ -190,14 +205,13 @@
     <ClInclude Include="ttfileio.h" />
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\svnrev\svnrev.v10.vcxproj">
+      <Project>{80f1c3f0-a213-4d48-85c8-a265990d19a7}</Project>
+    </ProjectReference>
     <ProjectReference Include="..\ttpcmn\ttpcmn.v10.vcxproj">
       <Project>{118e0d32-5553-4f73-9927-e873c1c500e4}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
     </ProjectReference>
-    <ProjectReference Include="..\ttpdlg\ttpdlg.v10.vcxproj">
-      <Project>{47cb840d-85c8-460f-9101-beb54bef9d56}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
     <ProjectReference Include="..\ttpfile\ttpfile.v10.vcxproj">
       <Project>{311f2b21-aec4-4384-8209-bb83b54749b4}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

Modified: branches/ssh_auth_dialog/teraterm/teraterm/ttermpro.v11.vcxproj
===================================================================
--- branches/ssh_auth_dialog/teraterm/teraterm/ttermpro.v11.vcxproj	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/teraterm/teraterm/ttermpro.v11.vcxproj	2019-04-24 14:08:16 UTC (rev 7613)
@@ -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)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <PlatformToolset>v110</PlatformToolset>
-    <UseOfMfc>Static</UseOfMfc>
+    <UseOfMfc>false</UseOfMfc>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|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">
@@ -62,7 +62,7 @@
     <ClCompile>
       <AdditionalOptions>/D"_CRT_SECURE_NO_DEPRECATE" %(AdditionalOptions)</AdditionalOptions>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(SolutionDir)common;$(SolutionDir)ttpfile;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\libs\oniguruma\src;$(SolutionDir)common;$(SolutionDir)ttpfile;$(SolutionDir)ttpdlg;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <BrowseInformation />
@@ -77,9 +77,9 @@
       <AdditionalIncludeDirectories>$(SolutionDir)common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>ws2_32.lib;imagehlp.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>onig_sd.lib;comctl32.lib;ws2_32.lib;imagehlp.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(SolutionDir)..\libs\oniguruma\src;$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <DelayLoadDLLs>imagehlp.dll;user32.dll;shell32.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
@@ -88,6 +88,10 @@
     <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>
@@ -102,7 +106,7 @@
       <AdditionalOptions>/D"_CRT_SECURE_NO_DEPRECATE" %(AdditionalOptions)</AdditionalOptions>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>$(SolutionDir)common;$(SolutionDir)ttpfile;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\libs\oniguruma\src;$(SolutionDir)common;$(SolutionDir)ttpfile;$(SolutionDir)ttpdlg;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -117,9 +121,9 @@
       <AdditionalIncludeDirectories>$(SolutionDir)common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>ws2_32.lib;imagehlp.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>onig_sd.lib;comctl32.lib;ws2_32.lib;imagehlp.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(SolutionDir)..\libs\oniguruma\src;$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <DelayLoadDLLs>imagehlp.dll;user32.dll;shell32.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
@@ -128,11 +132,19 @@
     <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\stdafx.cpp" />
+    <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" />
@@ -166,6 +178,8 @@
     <ClCompile Include="vtwin.cpp" />
     <ClCompile Include="winjump.c" />
     <ClCompile Include="WSAAsyncGetAddrInfo.c" />
+    <ClCompile Include="../ttpdlg/ttdlg.c" />
+    <ClInclude Include="../ttpdlg/ttdlg.h" />
   </ItemGroup>
   <ItemGroup>
     <Image Include="..\..\cygterm\cygterm.ico" />
@@ -178,6 +192,7 @@
   <ItemGroup>
     <ResourceCompile Include="tt-version.rc" />
     <ResourceCompile Include="ttermpro.rc" />
+    <ResourceCompile Include="../ttpdlg/ttpdlg.rc" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="addsetting.h" />
@@ -187,14 +202,13 @@
     <ClInclude Include="ttfileio.h" />
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\svnrev\svnrev.v11.vcxproj">
+      <Project>{80f1c3f0-a213-4d48-85c8-a265990d19a7}</Project>
+    </ProjectReference>
     <ProjectReference Include="..\ttpcmn\ttpcmn.v11.vcxproj">
       <Project>{118e0d32-5553-4f73-9927-e873c1c500e4}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
     </ProjectReference>
-    <ProjectReference Include="..\ttpdlg\ttpdlg.v11.vcxproj">
-      <Project>{47cb840d-85c8-460f-9101-beb54bef9d56}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
     <ProjectReference Include="..\ttpfile\ttpfile.v11.vcxproj">
       <Project>{311f2b21-aec4-4384-8209-bb83b54749b4}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

Modified: branches/ssh_auth_dialog/teraterm/teraterm/ttermpro.v12.vcxproj
===================================================================
--- branches/ssh_auth_dialog/teraterm/teraterm/ttermpro.v12.vcxproj	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/teraterm/teraterm/ttermpro.v12.vcxproj	2019-04-24 14:08:16 UTC (rev 7613)
@@ -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)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <PlatformToolset>v120</PlatformToolset>
-    <UseOfMfc>Static</UseOfMfc>
+    <UseOfMfc>false</UseOfMfc>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|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">
@@ -62,7 +62,7 @@
     <ClCompile>
       <AdditionalOptions>/D"_CRT_SECURE_NO_DEPRECATE" %(AdditionalOptions)</AdditionalOptions>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(SolutionDir)common;$(SolutionDir)ttpfile;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\libs\oniguruma\src;$(SolutionDir)common;$(SolutionDir)ttpfile;$(SolutionDir)ttpdlg;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <BrowseInformation />
@@ -77,18 +77,21 @@
       <AdditionalIncludeDirectories>$(SolutionDir)common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>nafxcwd.lib;LIBCMTD.lib;ws2_32.lib;imagehlp.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>onig_sd.lib;comctl32.lib;ws2_32.lib;imagehlp.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(SolutionDir)..\libs\oniguruma\src;$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <DelayLoadDLLs>imagehlp.dll;user32.dll;shell32.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX86</TargetMachine>
-      <IgnoreSpecificDefaultLibraries>nafxcwd.lib;LIBCMTD.lib</IgnoreSpecificDefaultLibraries>
     </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>
@@ -103,7 +106,7 @@
       <AdditionalOptions>/D"_CRT_SECURE_NO_DEPRECATE" %(AdditionalOptions)</AdditionalOptions>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>$(SolutionDir)common;$(SolutionDir)ttpfile;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\libs\oniguruma\src;$(SolutionDir)common;$(SolutionDir)ttpfile;$(SolutionDir)ttpdlg;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -118,23 +121,30 @@
       <AdditionalIncludeDirectories>$(SolutionDir)common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>nafxcw.lib;LIBCMT.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>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(SolutionDir)..\libs\oniguruma\src;$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <DelayLoadDLLs>imagehlp.dll;user32.dll;shell32.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX86</TargetMachine>
-      <IgnoreSpecificDefaultLibraries>nafxcw.lib;LIBCMT.lib</IgnoreSpecificDefaultLibraries>
     </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\stdafx.cpp" />
+    <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" />
@@ -168,6 +178,8 @@
     <ClCompile Include="vtwin.cpp" />
     <ClCompile Include="winjump.c" />
     <ClCompile Include="WSAAsyncGetAddrInfo.c" />
+    <ClCompile Include="../ttpdlg/ttdlg.c" />
+    <ClInclude Include="../ttpdlg/ttdlg.h" />
   </ItemGroup>
   <ItemGroup>
     <Image Include="..\..\cygterm\cygterm.ico" />
@@ -180,6 +192,7 @@
   <ItemGroup>
     <ResourceCompile Include="tt-version.rc" />
     <ResourceCompile Include="ttermpro.rc" />
+    <ResourceCompile Include="../ttpdlg/ttpdlg.rc" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\common\tt_res.h" />
@@ -189,14 +202,13 @@
     <ClInclude Include="ttfileio.h" />
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\svnrev\svnrev.v12.vcxproj">
+      <Project>{80f1c3f0-a213-4d48-85c8-a265990d19a7}</Project>
+    </ProjectReference>
     <ProjectReference Include="..\ttpcmn\ttpcmn.v12.vcxproj">
       <Project>{118e0d32-5553-4f73-9927-e873c1c500e4}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
     </ProjectReference>
-    <ProjectReference Include="..\ttpdlg\ttpdlg.v12.vcxproj">
-      <Project>{47cb840d-85c8-460f-9101-beb54bef9d56}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
     <ProjectReference Include="..\ttpfile\ttpfile.v12.vcxproj">
       <Project>{311f2b21-aec4-4384-8209-bb83b54749b4}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

Modified: branches/ssh_auth_dialog/teraterm/teraterm/ttermpro.v14.vcxproj
===================================================================
--- branches/ssh_auth_dialog/teraterm/teraterm/ttermpro.v14.vcxproj	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/teraterm/teraterm/ttermpro.v14.vcxproj	2019-04-24 14:08:16 UTC (rev 7613)
@@ -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)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <PlatformToolset>v140</PlatformToolset>
-    <UseOfMfc>Static</UseOfMfc>
+    <UseOfMfc>false</UseOfMfc>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|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">
@@ -64,7 +64,7 @@
     <ClCompile>
       <AdditionalOptions>/D"_CRT_SECURE_NO_DEPRECATE" %(AdditionalOptions)</AdditionalOptions>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(SolutionDir)common;$(SolutionDir)ttpfile;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\libs\oniguruma\src;$(SolutionDir)common;$(SolutionDir)ttpfile;$(SolutionDir)ttpdlg;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <BrowseInformation />
@@ -76,21 +76,24 @@
     <ResourceCompile>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <Culture>0x0411</Culture>
-      <AdditionalIncludeDirectories>$(SolutionDir)common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\libs\oniguruma\src;$(SolutionDir)common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>nafxcwd.lib;LIBCMTD.lib;ws2_32.lib;imagehlp.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>onig_sd.lib;comctl32.lib;ws2_32.lib;imagehlp.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(SolutionDir)..\libs\oniguruma\src;$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <DelayLoadDLLs>imagehlp.dll;user32.dll;shell32.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX86</TargetMachine>
-      <IgnoreSpecificDefaultLibraries>nafxcwd.lib;LIBCMTD.lib</IgnoreSpecificDefaultLibraries>
     </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>
@@ -105,7 +108,7 @@
       <AdditionalOptions>/D"_CRT_SECURE_NO_DEPRECATE" %(AdditionalOptions)</AdditionalOptions>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>$(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>
@@ -120,23 +123,30 @@
       <AdditionalIncludeDirectories>$(SolutionDir)common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>nafxcw.lib;LIBCMT.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>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(SolutionDir)..\libs\oniguruma\src;$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <DelayLoadDLLs>imagehlp.dll;user32.dll;shell32.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX86</TargetMachine>
-      <IgnoreSpecificDefaultLibraries>nafxcw.lib;LIBCMT.lib</IgnoreSpecificDefaultLibraries>
     </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\stdafx.cpp" />
+    <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" />
@@ -170,6 +180,8 @@
     <ClCompile Include="vtwin.cpp" />
     <ClCompile Include="winjump.c" />
     <ClCompile Include="WSAAsyncGetAddrInfo.c" />
+    <ClCompile Include="../ttpdlg/ttdlg.c" />
+    <ClInclude Include="../ttpdlg/ttdlg.h" />
   </ItemGroup>
   <ItemGroup>
     <Image Include="..\..\cygterm\cygterm.ico" />
@@ -182,6 +194,7 @@
   <ItemGroup>
     <ResourceCompile Include="tt-version.rc" />
     <ResourceCompile Include="ttermpro.rc" />
+    <ResourceCompile Include="../ttpdlg/ttpdlg.rc" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\common\tt_res.h" />
@@ -191,14 +204,13 @@
     <ClInclude Include="ttfileio.h" />
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\svnrev\svnrev.v14.vcxproj">
+      <Project>{80f1c3f0-a213-4d48-85c8-a265990d19a7}</Project>
+    </ProjectReference>
     <ProjectReference Include="..\ttpcmn\ttpcmn.v14.vcxproj">
       <Project>{118e0d32-5553-4f73-9927-e873c1c500e4}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
     </ProjectReference>
-    <ProjectReference Include="..\ttpdlg\ttpdlg.v14.vcxproj">
-      <Project>{47cb840d-85c8-460f-9101-beb54bef9d56}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
     <ProjectReference Include="..\ttpfile\ttpfile.v14.vcxproj">
       <Project>{311f2b21-aec4-4384-8209-bb83b54749b4}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

Modified: branches/ssh_auth_dialog/teraterm/teraterm/ttermpro.v15.vcxproj
===================================================================
--- branches/ssh_auth_dialog/teraterm/teraterm/ttermpro.v15.vcxproj	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/teraterm/teraterm/ttermpro.v15.vcxproj	2019-04-24 14:08:16 UTC (rev 7613)
@@ -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">
@@ -15,17 +15,18 @@
     <RootNamespace>ttermpro</RootNamespace>
     <Keyword>MFCProj</Keyword>
     <ProjectName>ttermpro</ProjectName>
+    <WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <PlatformToolset>v141</PlatformToolset>
-    <UseOfMfc>Static</UseOfMfc>
+    <UseOfMfc>false</UseOfMfc>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <PlatformToolset>v141</PlatformToolset>
-    <UseOfMfc>Static</UseOfMfc>
+    <UseOfMfc>false</UseOfMfc>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -64,7 +65,7 @@
     <ClCompile>
       <AdditionalOptions>/D"_CRT_SECURE_NO_DEPRECATE" %(AdditionalOptions)</AdditionalOptions>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(SolutionDir)common;$(SolutionDir)ttpfile;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\libs\oniguruma\src;$(SolutionDir)common;$(SolutionDir)ttpfile;$(SolutionDir)ttpdlg;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <BrowseInformation />
@@ -77,21 +78,24 @@
     <ResourceCompile>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <Culture>0x0411</Culture>
-      <AdditionalIncludeDirectories>$(SolutionDir)common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\libs\oniguruma\src;$(SolutionDir)common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>nafxcwd.lib;LIBCMTD.lib;ws2_32.lib;imagehlp.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>onig_sd.lib;comctl32.lib;ws2_32.lib;imagehlp.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(SolutionDir)..\libs\oniguruma\src;$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <DelayLoadDLLs>imagehlp.dll;user32.dll;shell32.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX86</TargetMachine>
-      <IgnoreSpecificDefaultLibraries>nafxcwd.lib;LIBCMTD.lib</IgnoreSpecificDefaultLibraries>
     </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>
@@ -106,7 +110,7 @@
       <AdditionalOptions>/D"_CRT_SECURE_NO_DEPRECATE" %(AdditionalOptions)</AdditionalOptions>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>$(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>
@@ -122,23 +126,30 @@
       <AdditionalIncludeDirectories>$(SolutionDir)common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>nafxcw.lib;LIBCMT.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>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(SolutionDir)..\libs\oniguruma\src;$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <DelayLoadDLLs>imagehlp.dll;user32.dll;shell32.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX86</TargetMachine>
-      <IgnoreSpecificDefaultLibraries>nafxcw.lib;LIBCMT.lib</IgnoreSpecificDefaultLibraries>
     </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\stdafx.cpp" />
+    <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" />
@@ -172,6 +183,9 @@
     <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" />
@@ -186,6 +200,7 @@
   <ItemGroup>
     <ResourceCompile Include="tt-version.rc" />
     <ResourceCompile Include="ttermpro.rc" />
+    <ResourceCompile Include="../ttpdlg/ttpdlg.rc" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\common\compat_w95.h" />
@@ -192,6 +207,7 @@
     <ClInclude Include="..\common\dlglib.h" />
     <ClInclude Include="..\common\tektypes.h" />
     <ClInclude Include="..\common\teraterm.h" />
+    <ClInclude Include="..\common\tmfc.h" />
     <ClInclude Include="..\common\tt-version.h" />
     <ClInclude Include="..\common\ttcommon.h" />
     <ClInclude Include="..\common\ttddecmnd.h" />
@@ -230,14 +246,13 @@
     <ClInclude Include="vtwin.h" />
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\svnrev\svnrev.v15.vcxproj">
+      <Project>{80f1c3f0-a213-4d48-85c8-a265990d19a7}</Project>
+    </ProjectReference>
     <ProjectReference Include="..\ttpcmn\ttpcmn.v15.vcxproj">
       <Project>{118e0d32-5553-4f73-9927-e873c1c500e4}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
     </ProjectReference>
-    <ProjectReference Include="..\ttpdlg\ttpdlg.v15.vcxproj">
-      <Project>{47cb840d-85c8-460f-9101-beb54bef9d56}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
     <ProjectReference Include="..\ttpfile\ttpfile.v15.vcxproj">
       <Project>{311f2b21-aec4-4384-8209-bb83b54749b4}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

Modified: branches/ssh_auth_dialog/teraterm/teraterm/ttermpro.v15.vcxproj.filters
===================================================================
--- branches/ssh_auth_dialog/teraterm/teraterm/ttermpro.v15.vcxproj.filters	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/teraterm/teraterm/ttermpro.v15.vcxproj.filters	2019-04-24 14:08:16 UTC (rev 7613)
@@ -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">
@@ -19,14 +19,14 @@
     <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="..\common\stdafx.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="tekwin.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -120,6 +120,33 @@
     <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">
@@ -154,6 +181,9 @@
     <ResourceCompile Include="ttermpro.rc">
       <Filter>Resource Files</Filter>
     </ResourceCompile>
+    <ResourceCompile Include="../ttpdlg/ttpdlg.rc">
+      <Filter>ttpdlg</Filter>
+    </ResourceCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="sizetip.h">
@@ -276,5 +306,14 @@
     <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

Copied: branches/ssh_auth_dialog/teraterm/teraterm/ttermpro.v16.vcxproj (from rev 7520, branches/ssh_auth_dialog/teraterm/teraterm/ttermpro.v15.vcxproj)
===================================================================
--- branches/ssh_auth_dialog/teraterm/teraterm/ttermpro.v16.vcxproj	                        (rev 0)
+++ branches/ssh_auth_dialog/teraterm/teraterm/ttermpro.v16.vcxproj	2019-04-24 14:08:16 UTC (rev 7613)
@@ -0,0 +1,281 @@
+<?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)..\libs\oniguruma\src;$(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="teraapp.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.v15.vcxproj">
+      <Project>{80f1c3f0-a213-4d48-85c8-a265990d19a7}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\ttpcmn\ttpcmn.v15.vcxproj">
+      <Project>{118e0d32-5553-4f73-9927-e873c1c500e4}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="..\ttpfile\ttpfile.v15.vcxproj">
+      <Project>{311f2b21-aec4-4384-8209-bb83b54749b4}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="..\ttpmacro\ttpmacro.v15.vcxproj">
+      <Project>{ba519362-a2c2-4b1a-905b-f00791f9038a}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="..\ttpset\ttpset.v15.vcxproj">
+      <Project>{5cf58947-e861-4a5c-b0b1-e85486f149cd}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="..\ttptek\ttptek.v15.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/ssh_auth_dialog/teraterm/teraterm/ttermpro.v16.vcxproj.filters (from rev 7520, branches/ssh_auth_dialog/teraterm/teraterm/ttermpro.v15.vcxproj.filters)
===================================================================
--- branches/ssh_auth_dialog/teraterm/teraterm/ttermpro.v16.vcxproj.filters	                        (rev 0)
+++ branches/ssh_auth_dialog/teraterm/teraterm/ttermpro.v16.vcxproj.filters	2019-04-24 14:08:16 UTC (rev 7613)
@@ -0,0 +1,319 @@
+<?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="teraapp.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/ssh_auth_dialog/teraterm/teraterm/ttermpro.v9.vcproj
===================================================================
--- branches/ssh_auth_dialog/teraterm/teraterm/ttermpro.v9.vcproj	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/teraterm/teraterm/ttermpro.v9.vcproj	2019-04-24 14:08:16 UTC (rev 7613)
@@ -21,11 +21,13 @@
 			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
 			IntermediateDirectory="$(ConfigurationName)"
 			ConfigurationType="1"
-			UseOfMFC="1"
+			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
+				Description="creating "$(ProjectDir)..\ttpdlg\svnversion.h""
+				CommandLine=""$(OutDir)\svnrev.exe" "$(SolutionDir)..\libs\svn\bin\svnversion.exe" "$(SolutionDir).." "$(ProjectDir)..\ttpdlg\svnversion.h""
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -49,7 +51,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/D"_CRT_SECURE_NO_DEPRECATE""
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)common;$(SolutionDir)ttpfile"
+				AdditionalIncludeDirectories="$(SolutionDir)..\libs\oniguruma\src;$(SolutionDir)common;$(SolutionDir)ttpfile;$(SolutionDir)ttpdlg"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
 				RuntimeLibrary="1"
 				BrowseInformation="0"
@@ -72,10 +74,10 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib imagehlp.lib"
+				AdditionalDependencies="onig_sd.lib comctl32.lib ws2_32.lib imagehlp.lib user32.lib gdi32.lib SHELL32.lib comctl32.lib comdlg32.lib ole32.lib ADVAPI32.lib OleAut32.lib"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="$(OutDir)"
+				AdditionalLibraryDirectories="$(SolutionDir)..\libs\oniguruma\src;$(OutDir)"
 				GenerateManifest="false"
 				DelayLoadDLLs="imagehlp.dll;user32.dll;shell32.dll"
 				GenerateDebugInformation="true"
@@ -112,11 +114,13 @@
 			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
 			IntermediateDirectory="$(ConfigurationName)"
 			ConfigurationType="1"
-			UseOfMFC="1"
+			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
+				Description="creating "$(ProjectDir)..\ttpdlg\svnversion.h""
+				CommandLine=""$(OutDir)\svnrev.exe" "$(SolutionDir)..\libs\svn\bin\svnversion.exe" "$(SolutionDir).." "$(ProjectDir)..\ttpdlg\svnversion.h""
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -141,7 +145,7 @@
 				AdditionalOptions="/D"_CRT_SECURE_NO_DEPRECATE""
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="$(SolutionDir)common;$(SolutionDir)ttpfile"
+				AdditionalIncludeDirectories="$(SolutionDir)..\libs\oniguruma\src;$(SolutionDir)common;$(SolutionDir)ttpfile;$(SolutionDir)ttpdlg"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
 				StringPooling="true"
 				RuntimeLibrary="0"
@@ -164,10 +168,10 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib imagehlp.lib"
+				AdditionalDependencies="onig_s.lib comctl32.lib ws2_32.lib imagehlp.lib user32.lib gdi32.lib SHELL32.lib comctl32.lib comdlg32.lib ole32.lib ADVAPI32.lib OleAut32.lib"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="$(OutDir)"
+				AdditionalLibraryDirectories="$(SolutionDir)..\libs\oniguruma\src;$(OutDir)"
 				GenerateManifest="false"
 				DelayLoadDLLs="imagehlp.dll;user32.dll;shell32.dll"
 				GenerateDebugInformation="true"
@@ -212,14 +216,22 @@
 				>
 			</File>
 			<File
-				RelativePath="dnddlg.cpp"
+				RelativePath="..\common\dlglib.c"
 				>
 			</File>
 			<File
-				RelativePath="..\common\dlglib.c"
+				RelativePath="..\common\dlglib_cpp.cpp"
 				>
 			</File>
 			<File
+				RelativePath="..\common\dlglib_tmpl.cpp"
+				>
+			</File>
+			<File
+				RelativePath="dnddlg.cpp"
+				>
+			</File>
+			<File
 				RelativePath="filesys.cpp"
 				>
 			</File>
@@ -236,10 +248,6 @@
 				>
 			</File>
 			<File
-				RelativePath="..\common\stdafx.cpp"
-				>
-			</File>
-			<File
 				RelativePath="tekwin.cpp"
 				>
 			</File>
@@ -252,6 +260,18 @@
 				>
 			</File>
 			<File
+				RelativePath="..\common\tmfc.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\common\tmfc.h"
+				>
+			</File>
+			<File
+				RelativePath="..\common\tmfc_frame.cpp"
+				>
+			</File>
+			<File
 				RelativePath="vtwin.cpp"
 				>
 			</File>
@@ -313,10 +333,18 @@
 				>
 			</File>
 			<File
+				RelativePath="..\common\codeconv.cpp"
+				>
+			</File>
+			<File
 				RelativePath="commlib.c"
 				>
 			</File>
 			<File
+				RelativePath="..\common\compat_win.cpp"
+				>
+			</File>
+			<File
 				RelativePath="keyboard.c"
 				>
 			</File>
@@ -333,6 +361,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\common\tipwin.cpp"
+				>
+			</File>
+			<File
 				RelativePath="ttdde.c"
 				>
 			</File>
@@ -396,10 +428,6 @@
 				RelativePath="..\common\dllutil.cpp"
 				>
 			</File>
-			<File
-				RelativePath="..\common\codeconv.cpp"
-				>
-			</File>
 		</Filter>
 		<Filter
 			Name="Header Files"
@@ -430,6 +458,30 @@
 				>
 			</File>
 		</Filter>
+		<Filter
+			Name="ttdlg"
+			>
+			<File
+				RelativePath="..\ttpdlg\dlg_res.h"
+				>
+			</File>
+			<File
+				RelativePath="..\ttpdlg\svnversion.h"
+				>
+			</File>
+			<File
+				RelativePath="..\ttpdlg\ttdlg.c"
+				>
+			</File>
+			<File
+				RelativePath="..\ttpdlg\ttdlg.h"
+				>
+			</File>
+			<File
+				RelativePath="..\ttpdlg\ttpdlg.rc"
+				>
+			</File>
+		</Filter>
 	</Files>
 	<Globals>
 		<Global

Modified: branches/ssh_auth_dialog/teraterm/teraterm/ttermpro.vcproj
===================================================================
--- branches/ssh_auth_dialog/teraterm/teraterm/ttermpro.vcproj	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/teraterm/teraterm/ttermpro.vcproj	2019-04-24 14:08:16 UTC (rev 7613)
@@ -20,11 +20,13 @@
 			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
 			IntermediateDirectory="$(ConfigurationName)"
 			ConfigurationType="1"
-			UseOfMFC="1"
+			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
+				Description="creating "$(ProjectDir)..\ttpdlg\svnversion.h""
+				CommandLine=""$(OutDir)\svnrev.exe" "$(SolutionDir)..\libs\svn\bin\svnversion.exe" "$(SolutionDir).." "$(ProjectDir)..\ttpdlg\svnversion.h""
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -48,7 +50,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/D"_CRT_SECURE_NO_DEPRECATE""
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)common;$(SolutionDir)ttpfile"
+				AdditionalIncludeDirectories="$(SolutionDir)..\libs\oniguruma\src;$(SolutionDir)common;$(SolutionDir)ttpfile;$(SolutionDir)ttpdlg"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
 				RuntimeLibrary="1"
 				BrowseInformation="0"
@@ -71,10 +73,10 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib imagehlp.lib"
+				AdditionalDependencies="onig_sd.lib comctl32.lib ws2_32.lib imagehlp.lib user32.lib gdi32.lib SHELL32.lib comctl32.lib comdlg32.lib ole32.lib ADVAPI32.lib OleAut32.lib"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="$(OutDir)"
+				AdditionalLibraryDirectories="$(SolutionDir)..\libs\oniguruma\src;$(OutDir)"
 				GenerateManifest="false"
 				DelayLoadDLLs="imagehlp.dll;user32.dll;shell32.dll"
 				GenerateDebugInformation="true"
@@ -112,11 +114,13 @@
 			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
 			IntermediateDirectory="$(ConfigurationName)"
 			ConfigurationType="1"
-			UseOfMFC="1"
+			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
+				Description="creating "$(ProjectDir)..\ttpdlg\svnversion.h""
+				CommandLine=""$(OutDir)\svnrev.exe" "$(SolutionDir)..\libs\svn\bin\svnversion.exe" "$(SolutionDir).." "$(ProjectDir)..\ttpdlg\svnversion.h""
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -141,7 +145,7 @@
 				AdditionalOptions="/D"_CRT_SECURE_NO_DEPRECATE""
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="$(SolutionDir)common;$(SolutionDir)ttpfile"
+				AdditionalIncludeDirectories="$(SolutionDir)..\libs\oniguruma\src;$(SolutionDir)common;$(SolutionDir)ttpfile;$(SolutionDir)ttpdlg"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
 				StringPooling="true"
 				RuntimeLibrary="0"
@@ -164,10 +168,10 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib imagehlp.lib"
+				AdditionalDependencies="onig_s.lib comctl32.lib ws2_32.lib imagehlp.lib user32.lib gdi32.lib SHELL32.lib comctl32.lib comdlg32.lib ole32.lib ADVAPI32.lib OleAut32.lib"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="$(OutDir)"
+				AdditionalLibraryDirectories="$(SolutionDir)..\libs\oniguruma\src;$(OutDir)"
 				GenerateManifest="false"
 				DelayLoadDLLs="imagehlp.dll;user32.dll;shell32.dll"
 				GenerateDebugInformation="true"
@@ -213,14 +217,22 @@
 				>
 			</File>
 			<File
-				RelativePath="dnddlg.cpp"
+				RelativePath="..\common\dlglib.c"
 				>
 			</File>
 			<File
-				RelativePath="..\common\dlglib.c"
+				RelativePath="..\common\dlglib_cpp.cpp"
 				>
 			</File>
 			<File
+				RelativePath="..\common\dlglib_tmpl.cpp"
+				>
+			</File>
+			<File
+				RelativePath="dnddlg.cpp"
+				>
+			</File>
+			<File
 				RelativePath="filesys.cpp"
 				>
 			</File>
@@ -237,10 +249,6 @@
 				>
 			</File>
 			<File
-				RelativePath="..\common\stdafx.cpp"
-				>
-			</File>
-			<File
 				RelativePath="tekwin.cpp"
 				>
 			</File>
@@ -253,6 +261,18 @@
 				>
 			</File>
 			<File
+				RelativePath="..\common\tmfc.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\common\tmfc.h"
+				>
+			</File>
+			<File
+				RelativePath="..\common\tmfc_frame.cpp"
+				>
+			</File>
+			<File
 				RelativePath="vtwin.cpp"
 				>
 			</File>
@@ -314,10 +334,22 @@
 				>
 			</File>
 			<File
+				RelativePath="..\common\codeconv.cpp"
+				>
+			</File>
+			<File
 				RelativePath="commlib.c"
 				>
 			</File>
 			<File
+				RelativePath="..\common\compat_win.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\common\dllutil.cpp"
+				>
+			</File>
+			<File
 				RelativePath="keyboard.c"
 				>
 			</File>
@@ -334,6 +366,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\common\tipwin.cpp"
+				>
+			</File>
+			<File
 				RelativePath="ttdde.c"
 				>
 			</File>
@@ -378,6 +414,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\common\win16api.c"
+				>
+			</File>
+			<File
 				RelativePath="winjump.c"
 				>
 			</File>
@@ -385,55 +425,59 @@
 				RelativePath="WSAAsyncGetAddrInfo.c"
 				>
 			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl"
+			>
 			<File
-				RelativePath="..\common\win16api.c"
+				RelativePath="addsetting.h"
 				>
 			</File>
 			<File
-				RelativePath="..\common\compat_win.cpp"
+				RelativePath="dnddlg.h"
 				>
 			</File>
 			<File
-				RelativePath="..\common\dllutil.cpp"
+				RelativePath="sizetip.h"
 				>
 			</File>
 			<File
-				RelativePath="..\common\codeconv.cpp"
+				RelativePath="..\common\tt_res.h"
 				>
 			</File>
 			<File
-				RelativePath="..\common\tipwin.cpp"
+				RelativePath="ttfileio.h"
 				>
 			</File>
+			<File
+				RelativePath="..\common\win16api.h"
+				>
+			</File>
 		</Filter>
 		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl"
+			Name="ttdlg"
 			>
 			<File
-				RelativePath="addsetting.h"
+				RelativePath="..\ttpdlg\dlg_res.h"
 				>
 			</File>
 			<File
-				RelativePath="dnddlg.h"
+				RelativePath="..\ttpdlg\svnversion.h"
 				>
 			</File>
 			<File
-				RelativePath="sizetip.h"
+				RelativePath="..\ttpdlg\ttdlg.c"
 				>
 			</File>
 			<File
-				RelativePath="..\common\tt_res.h"
+				RelativePath="..\ttpdlg\ttdlg.h"
 				>
 			</File>
 			<File
-				RelativePath="ttfileio.h"
+				RelativePath="..\ttpdlg\ttpdlg.rc"
 				>
 			</File>
-			<File
-				RelativePath="..\common\win16api.h"
-				>
-			</File>
 		</Filter>
 	</Files>
 	<Globals>

Modified: branches/ssh_auth_dialog/teraterm/teraterm/ttplug.c
===================================================================
--- branches/ssh_auth_dialog/teraterm/teraterm/ttplug.c	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/teraterm/teraterm/ttplug.c	2019-04-24 14:08:16 UTC (rev 7613)
@@ -72,7 +72,12 @@
   if (NumExtensions>=MAXNUMEXTENSIONS) return;
   LibHandle[NumExtensions] = LoadLibrary(fileName);
   if (LibHandle[NumExtensions] != NULL) {
-    TTXBindProc bind = (TTXBindProc)GetProcAddress(LibHandle[NumExtensions], "_TTXBind ＠ 8");
+#if defined(_MSC_VER)
+    const char *TTXBIND = "_TTXBind ＠ 8";
+#else
+    const char *TTXBIND = "TTXBind ＠ 8";
+#endif
+    TTXBindProc bind = (TTXBindProc)GetProcAddress(LibHandle[NumExtensions], TTXBIND);
     if (bind==NULL)
       bind = (TTXBindProc)GetProcAddress(LibHandle[NumExtensions], "TTXBind");
     if (bind != NULL) {

Modified: branches/ssh_auth_dialog/teraterm/teraterm/vtdisp.c
===================================================================
--- branches/ssh_auth_dialog/teraterm/teraterm/vtdisp.c	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/teraterm/teraterm/vtdisp.c	2019-04-24 14:08:16 UTC (rev 7613)
@@ -101,7 +101,6 @@
 int PageStart, BuffEnd;
 
 static BOOL CursorOnDBCS = FALSE;
-static LOGFONT VTlf;
 static BOOL SaveWinSize = FALSE;
 static int WinWidthOld, WinHeightOld;
 static HBRUSH Background;
@@ -112,7 +111,7 @@
 static int CaretStatus;
 static BOOL CaretEnabled = TRUE;
 BOOL IMEstat;				/* IME Status  TRUE=IME ON */
-BOOL IMEShowingCandidate;	/* \x8C\xF3\x95\xE2\x83E\x83B\x83\x93\x83h\x83E\x95\\x8E\xA6\x8F\xF3\x8B\xB5 TRUE=\x95\\x8E\xA6\x92\x86 */
+BOOL IMECompositionState;	/* \x95ϊ\xB7\x8F\xF3\x91\xD4 TRUE=\x95ϊ\xB7\x92\x86 */
 
 // ---- device context and status flags
 static HDC VTDC = NULL; /* Device context for VT window */
@@ -157,36 +156,36 @@
   char       fileTmp[MAX_PATH];
 }BGSrc;
 
-BGSrc BGDest;
-BGSrc BGSrc1;
-BGSrc BGSrc2;
+static BGSrc BGDest;
+static BGSrc BGSrc1;
+static BGSrc BGSrc2;
 
 int  BGEnable;
-int  BGReverseTextAlpha;
-int  BGUseAlphaBlendAPI;
+static int  BGReverseTextAlpha;
+static int  BGUseAlphaBlendAPI;
 BOOL BGNoFrame;
-BOOL BGFastSizeMove;
+static BOOL BGFastSizeMove;
 
-char BGSPIPath[MAX_PATH];
+static char BGSPIPath[MAX_PATH];
 
-COLORREF BGVTColor[2];
-COLORREF BGVTBoldColor[2];
-COLORREF BGVTBlinkColor[2];
-COLORREF BGVTReverseColor[2];
+static COLORREF BGVTColor[2];
+static COLORREF BGVTBoldColor[2];
+static COLORREF BGVTBlinkColor[2];
+static COLORREF BGVTReverseColor[2];
 /* begin - ishizaki */
-COLORREF BGURLColor[2];
+static COLORREF BGURLColor[2];
 /* end - ishizaki */
 
-RECT BGPrevRect;
-BOOL BGReverseText;
+static RECT BGPrevRect;
+static BOOL BGReverseText;
 
 BOOL   BGNoCopyBits;
-BOOL   BGInSizeMove;
-HBRUSH BGBrushInSizeMove;
+static BOOL   BGInSizeMove;
+static HBRUSH BGBrushInSizeMove;
 
-HDC hdcBGWork;
-HDC hdcBGBuffer;
-HDC hdcBG;
+static HDC hdcBGWork;
+static HDC hdcBGBuffer;
+static HDC hdcBG;
 
 typedef struct tagWallpaperInfo
 {
@@ -447,9 +446,9 @@
   if(!hSPI)
     goto error;
 
-  (FARPROC)SPI_GetPluginInfo = GetProcAddress(hSPI,"GetPluginInfo");
-  (FARPROC)SPI_IsSupported   = GetProcAddress(hSPI,"IsSupported");
-  (FARPROC)SPI_GetPicture    = GetProcAddress(hSPI,"GetPicture");
+  SPI_GetPluginInfo = (void *)GetProcAddress(hSPI,"GetPluginInfo");
+  SPI_IsSupported   = (void *)GetProcAddress(hSPI,"IsSupported");
+  SPI_GetPicture    = (void *)GetProcAddress(hSPI,"GetPicture");
 
   if(!SPI_GetPluginInfo || !SPI_IsSupported || !SPI_GetPicture)
     goto error;
@@ -1944,108 +1943,122 @@
        *Yw = (Ys - WinOrgY) * FontHeight;
 }
 
-void SetLogFont()
+static void SetLogFont(LOGFONTA *VTlf, BOOL mul)
 {
-  memset(&VTlf, 0, sizeof(LOGFONT));
-  VTlf.lfWeight = FW_NORMAL;
-  VTlf.lfItalic = 0;
-  VTlf.lfUnderline = 0;
-  VTlf.lfStrikeOut = 0;
-  VTlf.lfWidth = ts.VTFontSize.x;
-  VTlf.lfHeight = ts.VTFontSize.y;
-  VTlf.lfCharSet = ts.VTFontCharSet;
-  VTlf.lfOutPrecision  = OUT_CHARACTER_PRECIS;
-  VTlf.lfClipPrecision = CLIP_CHARACTER_PRECIS;
-  VTlf.lfQuality       = (BYTE)ts.FontQuality;
-  VTlf.lfPitchAndFamily = FIXED_PITCH | FF_DONTCARE;
-  strncpy_s(VTlf.lfFaceName, sizeof(VTlf.lfFaceName),ts.VTFont, _TRUNCATE);
+  memset(VTlf, 0, sizeof(*VTlf));
+  VTlf->lfWeight = FW_NORMAL;
+  VTlf->lfItalic = 0;
+  VTlf->lfUnderline = 0;
+  VTlf->lfStrikeOut = 0;
+  VTlf->lfWidth = ts.VTFontSize.x;
+  VTlf->lfHeight = ts.VTFontSize.y;
+  VTlf->lfCharSet = ts.VTFontCharSet;
+  VTlf->lfOutPrecision  = OUT_CHARACTER_PRECIS;
+  VTlf->lfClipPrecision = CLIP_CHARACTER_PRECIS;
+  VTlf->lfQuality       = (BYTE)ts.FontQuality;
+  VTlf->lfPitchAndFamily = FIXED_PITCH | FF_DONTCARE;
+  strncpy_s(VTlf->lfFaceName, sizeof(VTlf->lfFaceName),ts.VTFont, _TRUNCATE);
+#if 1
+  if (mul) {
+	  UINT uDpi;
+	  if (pGetDpiForWindow == NULL) {
+		  HDC TmpDC = GetDC(HVTWin);
+		  uDpi = GetDeviceCaps(TmpDC,LOGPIXELSY);	// \x82\xA2\x82\xE096\x82\xF0\x95Ԃ\xB7?
+		  ReleaseDC(HVTWin,TmpDC);
+	  } else {
+		  uDpi = pGetDpiForWindow(HVTWin);
+	  }
+	  VTlf->lfWidth = -MulDiv(VTlf->lfWidth, uDpi, 96);
+	  VTlf->lfHeight = -MulDiv(VTlf->lfHeight, uDpi, 96);
+  }
+#endif
 }
 
 void ChangeFont()
 {
-  int i, j;
-  TEXTMETRIC Metrics;
-  HDC TmpDC;
+	int i, j;
+	TEXTMETRIC Metrics;
+	LOGFONTA VTlf;
 
-  /* Delete Old Fonts */
-  for (i = 0 ; i <= AttrFontMask ; i++)
-  {
-    for (j = i+1 ; j <= AttrFontMask ; j++)
-      if (VTFont[j]==VTFont[i])
-        VTFont[j] = 0;
-    if (VTFont[i]!=0)
-      DeleteObject(VTFont[i]);
-  }
+	/* Delete Old Fonts */
+	for (i = 0 ; i <= AttrFontMask ; i++)
+	{
+		for (j = i+1 ; j <= AttrFontMask ; j++)
+			if (VTFont[j]==VTFont[i])
+				VTFont[j] = 0;
+		if (VTFont[i]!=0)
+			DeleteObject(VTFont[i]);
+	}
 
-  /* Normal Font */
-  SetLogFont();
-  VTFont[0] = CreateFontIndirect(&VTlf);
+	{
+		HDC TmpDC = GetDC(HVTWin);
 
-  /* set IME font */
-  SetConversionLogFont(HVTWin, &VTlf);
+		/* Normal Font */
+		SetLogFont(&VTlf, TRUE);
+		VTFont[0] = CreateFontIndirect(&VTlf);
 
-  TmpDC = GetDC(HVTWin);
+		/* set IME font */
+		SetConversionLogFont(HVTWin, &VTlf);
 
-  SelectObject(TmpDC, VTFont[0]);
-  GetTextMetrics(TmpDC, &Metrics);
-  FontWidth = Metrics.tmAveCharWidth + ts.FontDW;
-  FontHeight = Metrics.tmHeight + ts.FontDH;
+		SelectObject(TmpDC, VTFont[0]);
+		GetTextMetrics(TmpDC, &Metrics);
+		FontWidth = Metrics.tmAveCharWidth + ts.FontDW;
+		FontHeight = Metrics.tmHeight + ts.FontDH;
 
-  ReleaseDC(HVTWin,TmpDC);
+		ReleaseDC(HVTWin,TmpDC);
+	}
 
-  /* Underline */
-  VTlf.lfUnderline = 1;
-  VTFont[AttrUnder] = CreateFontIndirect(&VTlf);
+	/* Underline */
+	VTlf.lfUnderline = 1;
+	VTFont[AttrUnder] = CreateFontIndirect(&VTlf);
 
-  if (ts.FontFlag & FF_BOLD) {
-    /* Bold */
-    VTlf.lfUnderline = 0;
-    VTlf.lfWeight = FW_BOLD;
-    VTFont[AttrBold] = CreateFontIndirect(&VTlf);
-    /* Bold + Underline */
-    VTlf.lfUnderline = 1;
-    VTFont[AttrBold | AttrUnder] = CreateFontIndirect(&VTlf);
-  }
-  else {
-    VTFont[AttrBold] = VTFont[AttrDefault];
-    VTFont[AttrBold | AttrUnder] = VTFont[AttrUnder];
-  }
+	if (ts.FontFlag & FF_BOLD) {
+		/* Bold */
+		VTlf.lfUnderline = 0;
+		VTlf.lfWeight = FW_BOLD;
+		VTFont[AttrBold] = CreateFontIndirect(&VTlf);
+		/* Bold + Underline */
+		VTlf.lfUnderline = 1;
+		VTFont[AttrBold | AttrUnder] = CreateFontIndirect(&VTlf);
+	}
+	else {
+		VTFont[AttrBold] = VTFont[AttrDefault];
+		VTFont[AttrBold | AttrUnder] = VTFont[AttrUnder];
+	}
 
-  /* Special font */
-  VTlf.lfWeight = FW_NORMAL;
-  VTlf.lfUnderline = 0;
-  VTlf.lfWidth = FontWidth + 1; /* adjust width */
-  VTlf.lfHeight = FontHeight;
-  VTlf.lfCharSet = SYMBOL_CHARSET;
+	/* Special font */
+	VTlf.lfWeight = FW_NORMAL;
+	VTlf.lfUnderline = 0;
+	VTlf.lfWidth = FontWidth + 1; /* adjust width */
+	VTlf.lfHeight = FontHeight;
+	VTlf.lfCharSet = SYMBOL_CHARSET;
 
-  strncpy_s(VTlf.lfFaceName, sizeof(VTlf.lfFaceName),"Tera Special", _TRUNCATE);
-  VTFont[AttrSpecial] = CreateFontIndirect(&VTlf);
+	strncpy_s(VTlf.lfFaceName, sizeof(VTlf.lfFaceName),"Tera Special", _TRUNCATE);
+	VTFont[AttrSpecial] = CreateFontIndirect(&VTlf);
 
-  /* Special font (Underline) */
-  VTlf.lfUnderline = 1;
-  VTlf.lfHeight = FontHeight - 1; // adjust for underline
-  VTFont[AttrSpecial | AttrUnder] = CreateFontIndirect(&VTlf);
+	/* Special font (Underline) */
+	VTlf.lfUnderline = 1;
+	VTlf.lfHeight = FontHeight - 1; // adjust for underline
+	VTFont[AttrSpecial | AttrUnder] = CreateFontIndirect(&VTlf);
 
-  if (ts.FontFlag & FF_BOLD) {
-    /* Special font (Bold) */
-    VTlf.lfUnderline = 0;
-    VTlf.lfHeight = FontHeight;
-    VTlf.lfWeight = FW_BOLD;
-    VTFont[AttrSpecial | AttrBold] = CreateFontIndirect(&VTlf);
-    /* Special font (Bold + Underline) */
-    VTlf.lfUnderline = 1;
-    VTlf.lfHeight = FontHeight - 1; // adjust for underline
-    VTFont[AttrSpecial | AttrBold | AttrUnder] = CreateFontIndirect(&VTlf);
-  }
-  else {
-    VTFont[AttrSpecial | AttrBold] = VTFont[AttrSpecial];
-    VTFont[AttrSpecial | AttrBold | AttrUnder] = VTFont[AttrSpecial | AttrUnder];
-  }
+	if (ts.FontFlag & FF_BOLD) {
+		/* Special font (Bold) */
+		VTlf.lfUnderline = 0;
+		VTlf.lfHeight = FontHeight;
+		VTlf.lfWeight = FW_BOLD;
+		VTFont[AttrSpecial | AttrBold] = CreateFontIndirect(&VTlf);
+		/* Special font (Bold + Underline) */
+		VTlf.lfUnderline = 1;
+		VTlf.lfHeight = FontHeight - 1; // adjust for underline
+		VTFont[AttrSpecial | AttrBold | AttrUnder] = CreateFontIndirect(&VTlf);
+	}
+	else {
+		VTFont[AttrSpecial | AttrBold] = VTFont[AttrSpecial];
+		VTFont[AttrSpecial | AttrBold | AttrUnder] = VTFont[AttrSpecial | AttrUnder];
+	}
 
-  SetLogFont();
-
-  for (i = 0 ; i < TermWidthMax; i++)
-    Dx[i] = FontWidth;
+	for (i = 0 ; i < TermWidthMax; i++)
+		Dx[i] = FontWidth;
 }
 
 void ResetIME()
@@ -2069,8 +2082,11 @@
 
 		if (ts.UseIME>0)
 		{
-			if (ts.IMEInline>0)
+			if (ts.IMEInline>0) {
+				LOGFONTA VTlf;
+				SetLogFont(&VTlf, TRUE);
 				SetConversionLogFont(HVTWin, &VTlf);
+			}
 			else
 				SetConversionWindow(HVTWin,-1,0);
 		}
@@ -2227,11 +2243,11 @@
 		CaretX = (CursorX-WinOrgX)*FontWidth;
 		CaretY = (CursorY-WinOrgY)*FontHeight;
 
-		if (IMEstat && IMEShowingCandidate) {
-			// IME ON && \x8C\xF3\x95\xE2\x83E\x83B\x83\x93\x83h\x83E\x95\\x8E\xA6\x92\x86\x82̏ꍇ\x82݂̂̏\x88\x97\x9D
-			// \x8C\xF3\x95\xE2\x83E\x83B\x83\x93\x83h\x83E\x82\xAA\x95\\x8E\xA6\x82\xB3\x82\xEA\x82Ă\xA2\x82\xE9\x8F\xF3\x91Ԃ\xC5
+		if (IMEstat && IMECompositionState) {
+			// IME ON && \x95ϊ\xB7\x92\x86\x82̏ꍇ\x82݂̂̏\x88\x97\x9D\x82\xB7\x82\xE9\x81B
+			// \x95ϊ\xB7\x92\x86(\x8A\xBF\x8E\x9A\x82\xE2\x8C\xF3\x95\xE2\x83E\x83B\x83\x93\x83h\x83E\x82\xAA\x95\\x8E\xA6\x82\xB3\x82\xEA\x82Ă\xA2\x82\xE9\x8F\xF3\x91\xD4)\x82\xC5
 			// \x83z\x83X\x83g\x82\xA9\x82\xE7\x82̃G\x83R\x81[\x82\xF0\x8E\xF3\x90M\x82\xB5\x82\xC4caret\x88ʒu\x82\xAA\x95ω\xBB\x82\xB5\x82\xBD\x8Fꍇ\x81A
-			// \x95ϊ\xB7\x83E\x83B\x83\x93\x83h\x83E\x82̈ʒu\x82\xF0\x8DX\x90V\x82\xB7\x82\xE9\x95K\x97v\x82\xAA\x82\xA0\x82\xE9
+			// \x95ϊ\xB7\x82\xB5\x82Ă\xA2\x82\xE9\x88ʒu\x82\xF0\x8DX\x90V\x82\xB7\x82\xE9\x95K\x97v\x82\xAA\x82\xA0\x82\xE9\x81B
 			SetConversionWindow(HVTWin,CaretX,CaretY);
 		}
 
@@ -2510,8 +2526,8 @@
     ANSIColor[IdBack ]   = ts.VTColor[1];
 
 #ifdef ALPHABLEND_TYPE2
-      ANSIColor[IdFore ]   = BGVTColor[0];
-     ANSIColor[IdBack ]   = BGVTColor[1];
+	ANSIColor[IdFore ]   = BGVTColor[0];
+	ANSIColor[IdBack ]   = BGVTColor[1];
 #endif  // ALPHABLEND_TYPE2
 
   }
@@ -3357,10 +3373,11 @@
 //  reset window
 {
   BOOL Ok;
+  LOGFONTA VTlf;
 
   ts.VTFlag = 1;
   if (! LoadTTDLG()) return;
-  SetLogFont();
+  SetLogFont(&VTlf, FALSE);
   Ok = ChooseFontDlg(HVTWin,&VTlf,&ts);
   FreeTTDLG();
   if (! Ok) return;
@@ -3902,3 +3919,10 @@
 	}
 	return color;
 }
+
+void DpiChanged(void)
+{
+  ChangeFont();
+  DispChangeWinSize(WinWidth,WinHeight);
+  ChangeCaret();
+}

Modified: branches/ssh_auth_dialog/teraterm/teraterm/vtdisp.h
===================================================================
--- branches/ssh_auth_dialog/teraterm/teraterm/vtdisp.h	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/teraterm/teraterm/vtdisp.h	2019-04-24 14:08:16 UTC (rev 7613)
@@ -55,7 +55,7 @@
   (int Xw, int Yw, int *Xs, int *Ys, PBOOL Right);
 void DispConvScreenToWin
   (int Xs, int Ys, int *Xw, int *Yw);
-void SetLogFont();
+//void SetLogFont();
 void ChangeFont();
 void ResetIME();
 void ChangeCaret();
@@ -116,6 +116,7 @@
 void DispGetRootWinSize(int *x, int *y, BOOL inPixels);
 int DispFindClosestColor(int red, int green, int blue);
 void UpdateBGBrush(void);
+void DpiChanged(void);
 
 extern int WinWidth, WinHeight;
 extern HFONT VTFont[AttrFontMask+1];
@@ -128,7 +129,7 @@
 extern TCharAttr DefCharAttr;
 
 extern BOOL IMEstat;
-extern BOOL IMEShowingCandidate;
+extern BOOL IMECompositionState;
 
 #define SCROLL_BOTTOM	1
 #define SCROLL_LINEDOWN	2

Modified: branches/ssh_auth_dialog/teraterm/teraterm/vtwin.cpp
===================================================================
--- branches/ssh_auth_dialog/teraterm/teraterm/vtwin.cpp	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/teraterm/teraterm/vtwin.cpp	2019-04-24 14:08:16 UTC (rev 7613)
@@ -30,7 +30,7 @@
 
 /* TERATERM.EXE, VT window */
 
-#include "stdafx.h"
+#include "teraterm_conf.h"
 #include "teraterm.h"
 #include "tttypes.h"
 
@@ -49,28 +49,31 @@
 #include "filesys.h"
 #include "telnet.h"
 #include "tektypes.h"
-#include "tekwin.h"
 #include "ttdde.h"
 #include "ttlib.h"
+#include "dlglib.h"
 #include "helpid.h"
 #include "teraprn.h"
 #include <winsock2.h>
 #include <ws2tcpip.h>
 #include "ttplug.h"  /* TTPLUG */
+#include "teraterml.h"
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <locale.h>
+#include <tchar.h>
 
 #include <shlobj.h>
 #include <io.h>
 #include <errno.h>
 #include <imagehlp.h>
+#include <crtdbg.h>
 
 #include <windowsx.h>
 #include <imm.h>
-#include <Dbt.h>
+#include <dbt.h>
 #include <assert.h>
 
 #include "tt_res.h"
@@ -79,6 +82,8 @@
 #include "winjump.h"
 #include "sizetip.h"
 #include "dnddlg.h"
+#include "tekwin.h"
+#include <htmlhelp.h>
 #include "compat_win.h"
 
 #include "initguid.h"
@@ -86,12 +91,34 @@
 DEFINE_GUID(GUID_DEVINTERFACE_USB_DEVICE, 0xA5DCBF10L, 0x6530, 0x11D2, 0x90, 0x1F, 0x00, \
              0xC0, 0x4F, 0xB9, 0x51, 0xED);
 
-#define VTClassName "VTWin32"
+#define CFrameWnd	TTCFrameWnd
 
+#define VTClassName _T("VTWin32")
+
+#undef SetDlgItemText
+#define SetDlgItemText SetDlgItemTextA
+#undef CreateProcess
+#define CreateProcess CreateProcessA
+#undef STARTUPINFO
+#define STARTUPINFO STARTUPINFOA
+#undef GetStartupInfo
+#define GetStartupInfo GetStartupInfoA
+
+#if defined(UNICODE)
+#define CreateProcessT CreateProcessW
+#define GetStartupInfoT GetStartupInfoW
+#define STARTUPINFOT STARTUPINFOW
+#define SetDlgItemTextT SetDlgItemTextW
+#else
+#define CreateProcessT CreateProcessA
+#define GetStartupInfoT GetStartupInfoA
+#define STARTUPINFOT STARTUPINFOA
+#define SetDlgItemTextT SetDlgItemTextA
+#endif
+
 #ifdef _DEBUG
-#define new DEBUG_NEW
-#undef THIS_FILE
-static char THIS_FILE[] = __FILE__;
+#define malloc(l)   _malloc_dbg((l), _NORMAL_BLOCK, __FILE__, __LINE__)
+#define new  		::new(_NORMAL_BLOCK, __FILE__, __LINE__)
 #endif
 
 // \x83E\x83B\x83\x93\x83h\x83E\x8Dő剻\x83{\x83^\x83\x93\x82\xF0\x97L\x8C\xF8\x82ɂ\xB7\x82\xE9 (2005.1.15 yutaka)
@@ -103,10 +130,6 @@
 
 #define BROADCAST_LOGFILE "broadcast.log"
 
-static HFONT DlgBroadcastFont;
-static HFONT DlgCommentFont;
-static HFONT DlgSetupdirFont;
-
 static BOOL TCPLocalEchoUsed = FALSE;
 static BOOL TCPCRSendUsed = FALSE;
 
@@ -116,9 +139,6 @@
 
 static int AutoDisconnectedPort = -1;
 
-// \x96{\x91̂\xCD addsetting.cpp
-extern mouse_cursor_t MouseCursor[];
-
 #ifndef WM_IME_COMPOSITION
 #define WM_IME_COMPOSITION              0x010F
 #endif
@@ -126,6 +146,7 @@
 /////////////////////////////////////////////////////////////////////////////
 // CVTWindow
 
+#if 0
 BEGIN_MESSAGE_MAP(CVTWindow, CFrameWnd)
 	//{{AFX_MSG_MAP(CVTWindow)
 	ON_WM_ACTIVATE()
@@ -264,11 +285,18 @@
 	ON_COMMAND(ID_HELP_INDEX2, OnHelpIndex)
 	ON_COMMAND(ID_HELP_ABOUT, OnHelpAbout)
 	ON_MESSAGE(WM_USER_DROPNOTIFY, OnDropNotify)
+	ON_MESSAGE(WM_DPICHANGED, OnDpiChanged)
 	//}}AFX_MSG_MAP
 END_MESSAGE_MAP()
+#endif
 
+static HINSTANCE AfxGetInstanceHandle()
+{
+	return hInst;
+}
+
 // Tera Term\x8BN\x93\xAE\x8E\x9E\x82\xC6URL\x95\xB6\x8E\x9A\x97\xF1mouse over\x8E\x9E\x82ɌĂ΂\xEA\x82\xE9 (2005.4.2 yutaka)
-void SetMouseCursor(char *cursor)
+static void SetMouseCursor(const char *cursor)
 {
 	HCURSOR hc;
 	LPCTSTR name = NULL;
@@ -303,7 +331,7 @@
 	if (Alpha == alpha) {
 		return;	// \x95ω\xBB\x82Ȃ\xB5\x82Ȃ牽\x82\xE0\x82\xB5\x82Ȃ\xA2
 	}
-	LONG_PTR lp = ::GetWindowLongPtr(HVTWin, GWL_EXSTYLE);
+	LONG_PTR lp = GetWindowLongPtr(GWL_EXSTYLE);
 	if (lp == 0) {
 		return;
 	}
@@ -369,7 +397,7 @@
 // (2007.9.30 yutaka)
 //
 // \x97\xE1\x8AO\x83R\x81[\x83h\x82𕶎\x9A\x97\xF1\x82֕ϊ\xB7\x82\xB7\x82\xE9
-static char *GetExceptionString(int exception)
+static const char *GetExceptionString(DWORD exception)
 {
 #define EXCEPTION(x) case EXCEPTION_##x: return (#x);
 	static char buf[16];
@@ -739,6 +767,18 @@
 	}
 	FreeTTSET();
 
+	// DPI Aware (\x8D\x82DPI\x91Ή\x9E)
+	{
+		int dip_aware = 0;
+		dip_aware = GetPrivateProfileInt("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);
@@ -787,7 +827,7 @@
 #endif
 
 	wc.style = CS_DBLCLKS | CS_HREDRAW | CS_VREDRAW;
-	wc.lpfnWndProc = AfxWndProc;
+	wc.lpfnWndProc = (WNDPROC)ProcStub;
 	wc.cbClsExtra = 0;
 	wc.cbWndExtra = 0;
 	wc.hInstance = AfxGetInstanceHandle();
@@ -799,7 +839,7 @@
 	wc.lpszClassName = VTClassName;
 
 	RegisterClass(&wc);
-	LoadAccelTable(MAKEINTRESOURCE(IDR_ACC));
+	m_hAccel = ::LoadAccelerators(hInst, MAKEINTRESOURCE(IDR_ACC));
 
 	if (ts.VTPos.x==CW_USEDEFAULT) {
 		rect = rectDefault;
@@ -810,7 +850,7 @@
 		rect.right = rect.left + 100;
 		rect.bottom = rect.top + 100;
 	}
-	Create(VTClassName, "Tera Term", Style, rect, NULL, NULL);
+	Create(hInst, VTClassName, _T("Tera Term"), Style, rect, NULL, NULL);
 
 	/*--------- Init2 -----------------*/
 	HVTWin = GetSafeHwnd();
@@ -827,9 +867,9 @@
 #ifdef ALPHABLEND_TYPE2
 //<!--by AKASI
 	if(BGNoFrame && ts.HideTitle > 0) {
-		ExStyle  = GetWindowLong(HVTWin,GWL_EXSTYLE);
+		ExStyle  = ::GetWindowLongPtr(HVTWin,GWL_EXSTYLE);
 		ExStyle &= ~WS_EX_CLIENTEDGE;
-		SetWindowLong(HVTWin,GWL_EXSTYLE,ExStyle);
+		::SetWindowLongPtr(HVTWin,GWL_EXSTYLE,ExStyle);
 	}
 //-->
 #endif
@@ -909,7 +949,7 @@
 
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef _DEBUG
+#if 0 //def _DEBUG
 void CVTWindow::AssertValid() const
 {
 	CFrameWnd::AssertValid();
@@ -1015,8 +1055,9 @@
 		return;
 	}
 
-	if (mousereport = MouseReport(IdMouseEventBtnDown, LMR, p.x, p.y)) {
-		SetCapture();
+	mousereport = MouseReport(IdMouseEventBtnDown, LMR, p.x, p.y);
+	if (mousereport) {
+		::SetCapture(m_hWnd);
 		return;
 	}
 
@@ -1329,6 +1370,12 @@
 	GetMenuString(SetupMenu, ID_SETUP_FONT, uimsg, sizeof(uimsg), MF_BYCOMMAND);
 	get_lang_msg("MENU_SETUP_FONT", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
 	ModifyMenu(SetupMenu, ID_SETUP_FONT, MF_BYCOMMAND, ID_SETUP_FONT, ts.UIMsg);
+	GetMenuString(SetupMenu, ID_SETUP_DLG_FONT, uimsg, sizeof(uimsg), MF_BYCOMMAND);
+	get_lang_msg("MENU_SETUP_DIALOG_FONT", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
+	ModifyMenu(SetupMenu, ID_SETUP_DLG_FONT, MF_BYCOMMAND, ID_SETUP_FONT, ts.UIMsg);
+	GetMenuString(SetupMenu, 2, uimsg, sizeof(uimsg), MF_BYPOSITION);
+	get_lang_msg("MENU_SETUP_FONT_SUBMENU", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
+	ModifyMenu(SetupMenu, 2, MF_BYPOSITION, 2, ts.UIMsg);
 	GetMenuString(SetupMenu, ID_SETUP_KEYBOARD, uimsg, sizeof(uimsg), MF_BYCOMMAND);
 	get_lang_msg("MENU_SETUP_KEYBOARD", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
 	ModifyMenu(SetupMenu, ID_SETUP_KEYBOARD, MF_BYCOMMAND, ID_SETUP_KEYBOARD, ts.UIMsg);
@@ -1856,7 +1903,7 @@
 	}
 }
 
-void CVTWindow::OnActivate(UINT nState, CWnd* pWndOther, BOOL bMinimized)
+void CVTWindow::OnActivate(UINT nState, HWND pWndOther, BOOL bMinimized)
 {
 	DispSetActive(nState!=WA_INACTIVE);
 	if (nState == WA_INACTIVE) {
@@ -1991,8 +2038,10 @@
 
 	FreeIME(HVTWin);
 	FreeTTSET();
+#if 0	// free\x82Ɏ\xB8\x94s\x82\xB7\x82\xE9\x82܂\xC5free\x82\xB5\x91\xB1\x82\xAF\x82\xE9
 	do { }
 	while (FreeTTDLG());
+#endif
 
 	do { }
 	while (FreeTTFILE());
@@ -2119,10 +2168,9 @@
 	for (int i = 0; i < DropListCount; i++) {
 		const char *FileName = DropLists[i];
 		const DWORD attr = GetFileAttributes(FileName);
-		if (attr == -1 ) {
-			goto finish;
-		}
-		if (attr & FILE_ATTRIBUTE_DIRECTORY) {
+		if (attr == (DWORD)-1 ) {
+			FileCount++;
+		} else if (attr & FILE_ATTRIBUTE_DIRECTORY) {
 			DirectoryCount++;
 		} else {
 			FileCount++;
@@ -2202,6 +2250,8 @@
 		if (!DoSameProcess) {
 			bool DoSameProcessNextDrop;
 			bool DoNotShowDialog = !DefaultShowDialog;
+			SetDialogFont(ts.SetupFName,
+						  ts.UILanguageFile, "Tera Term", "DLG_SYSTEM_FONT");
 			DropType =
 				ShowDropDialogBox(hInst, HVTWin,
 								  FileName, DropType,
@@ -2239,6 +2289,7 @@
 				ts.TransBin = DropType == DROP_TYPE_SEND_FILE ? 0 : 1;
 				FileSendStart();
 #if 0
+#if 0
 				goto finish;	// send file\x82͘A\x91\xB1\x82\xB5\x82Ăł\xAB\x82Ȃ\xA2
 #else
 				{
@@ -2252,6 +2303,7 @@
 					}
 				}
 #endif
+#endif
 			}
 			break;
 		case DROP_TYPE_PASTE_FILENAME:
@@ -2321,7 +2373,7 @@
 #endif
 }
 
-void CVTWindow::OnHScroll(UINT nSBCode, UINT nPos, CScrollBar* pScrollBar)
+void CVTWindow::OnHScroll(UINT nSBCode, UINT nPos, HWND pScrollBar)
 {
 	int Func;
 
@@ -2356,9 +2408,9 @@
 	DispHScroll(Func,nPos);
 }
 
-void CVTWindow::OnInitMenuPopup(CMenu* pPopupMenu, UINT nIndex, BOOL bSysMenu)
+void CVTWindow::OnInitMenuPopup(HMENU hPopupMenu, UINT nIndex, BOOL bSysMenu)
 {
-	InitMenuPopup(pPopupMenu->m_hMenu);
+	InitMenuPopup(hPopupMenu);
 }
 
 void CVTWindow::OnKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags)
@@ -2400,11 +2452,11 @@
 	KeyUp(nChar);
 }
 
-void CVTWindow::OnKillFocus(CWnd* pNewWnd)
+void CVTWindow::OnKillFocus(HWND hNewWnd)
 {
 	DispDestroyCaret();
 	FocusReport(FALSE);
-	CFrameWnd::OnKillFocus(pNewWnd);
+//	CFrameWnd::OnKillFocus(hNewWnd);		// TODO
 
 	if (IsCaretOn()) {
 		CaretKillFocus(TRUE);
@@ -2411,7 +2463,7 @@
 	}
 }
 
-void CVTWindow::OnLButtonDblClk(UINT nFlags, CPoint point)
+void CVTWindow::OnLButtonDblClk(UINT nFlags, POINTS point)
 {
 	if (LButton || MButton || RButton) {
 		return;
@@ -2440,7 +2492,7 @@
 	::SetTimer(HVTWin, IdScrollTimer, 100, NULL);
 }
 
-void CVTWindow::OnLButtonDown(UINT nFlags, CPoint point)
+void CVTWindow::OnLButtonDown(UINT nFlags, POINTS point)
 {
 	POINT p;
 
@@ -2449,7 +2501,7 @@
 	ButtonDown(p,IdLeftButton);
 }
 
-void CVTWindow::OnLButtonUp(UINT nFlags, CPoint point)
+void CVTWindow::OnLButtonUp(UINT nFlags, POINTS point)
 {
 	if (IgnoreRelease)
 		IgnoreRelease = FALSE;
@@ -2464,7 +2516,7 @@
 	ButtonUp(FALSE);
 }
 
-void CVTWindow::OnMButtonDown(UINT nFlags, CPoint point)
+void CVTWindow::OnMButtonDown(UINT nFlags, POINTS point)
 {
 	POINT p;
 
@@ -2473,7 +2525,7 @@
 	ButtonDown(p,IdMiddleButton);
 }
 
-void CVTWindow::OnMButtonUp(UINT nFlags, CPoint point)
+void CVTWindow::OnMButtonUp(UINT nFlags, POINTS point)
 {
 	if (IgnoreRelease)
 		IgnoreRelease = FALSE;
@@ -2494,7 +2546,7 @@
 	}
 }
 
-int CVTWindow::OnMouseActivate(CWnd* pDesktopWnd, UINT nHitTest, UINT message)
+int CVTWindow::OnMouseActivate(HWND pDesktopWnd, UINT nHitTest, UINT message)
 {
 	if ((ts.SelOnActive==0) && (nHitTest==HTCLIENT)) { //disable mouse event for text selection
 		IgnoreRelease = TRUE;
@@ -2505,7 +2557,7 @@
 	}
 }
 
-void CVTWindow::OnMouseMove(UINT nFlags, CPoint point)
+void CVTWindow::OnMouseMove(UINT nFlags, POINTS point)
 {
 	int i;
 	BOOL mousereport;
@@ -2551,9 +2603,13 @@
 BOOL CVTWindow::OnMouseWheel(
 	UINT nFlags,   // \x89\xBC\x91z\x83L\x81[
 	short zDelta,  // \x89\xF1\x93]\x8B\x97\x97\xA3
-	CPoint pt      // \x83J\x81[\x83\\x83\x8B\x88ʒu
+	POINTS pts     // \x83J\x81[\x83\\x83\x8B\x88ʒu
 )
 {
+	POINT pt;
+	pt.x = pts.x;
+	pt.y = pts.y;
+
 	int line, i;
 
 	if (pSetLayeredWindowAttributes != NULL) {
@@ -2607,23 +2663,23 @@
 	return (TRUE);
 }
 
+#if 0
+// \x89\xBD\x82\xE0\x82\xB5\x82Ă\xA2\x82Ȃ\xA2
 void CVTWindow::OnNcCalcSize(BOOL valid, NCCALCSIZE_PARAMS *sizeinfo)
 {
 	CWnd::OnNcCalcSize(valid, sizeinfo);
 	return;
 }
+#endif
 
-void CVTWindow::OnNcLButtonDblClk(UINT nHitTest, CPoint point)
+void CVTWindow::OnNcLButtonDblClk(UINT nHitTest, POINTS point)
 {
 	if (! Minimized && !ts.TermIsWin && (nHitTest == HTCAPTION)) {
 		DispRestoreWinSize();
 	}
-	else {
-		CFrameWnd::OnNcLButtonDblClk(nHitTest,point);
-	}
 }
 
-void CVTWindow::OnNcRButtonDown(UINT nHitTest, CPoint point)
+void CVTWindow::OnNcRButtonDown(UINT nHitTest, POINTS point)
 {
 	if ((nHitTest==HTCAPTION) &&
 	    (ts.HideTitle>0) &&
@@ -2635,12 +2691,11 @@
 void CVTWindow::OnPaint()
 {
 	PAINTSTRUCT ps;
-	CDC *cdc;
 	HDC PaintDC;
 	int Xs, Ys, Xe, Ye;
 
 	// \x95\\x8E\xA6\x82\xB3\x82\xEA\x82Ă\xA2\x82Ȃ\xAD\x82Ă\xE0WM_PAINT\x82\xAA\x94\xAD\x90\xB6\x82\xB7\x82\xE9\x83P\x81[\x83X\x91΍\xF4
-	if (IsWindowVisible() == 0) {
+	if (::IsWindowVisible(m_hWnd) == 0) {
 		return;
 	}
 
@@ -2650,8 +2705,7 @@
 //-->
 #endif
 
-	cdc = BeginPaint(&ps);
-	PaintDC = cdc->GetSafeHdc();
+	PaintDC = BeginPaint(&ps);
 
 	PaintWindow(PaintDC,ps.rcPaint,ps.fErase, &Xs,&Ys,&Xe,&Ye);
 	LockBuffer();
@@ -2671,7 +2725,7 @@
 	}
 }
 
-void CVTWindow::OnRButtonDown(UINT nFlags, CPoint point)
+void CVTWindow::OnRButtonDown(UINT nFlags, POINTS point)
 {
 	POINT p;
 
@@ -2680,7 +2734,7 @@
 	ButtonDown(p,IdRightButton);
 }
 
-void CVTWindow::OnRButtonUp(UINT nFlags, CPoint point)
+void CVTWindow::OnRButtonUp(UINT nFlags, POINTS point)
 {
 	if (IgnoreRelease)
 		IgnoreRelease = FALSE;
@@ -2705,11 +2759,10 @@
 	}
 }
 
-void CVTWindow::OnSetFocus(CWnd* pOldWnd)
+void CVTWindow::OnSetFocus(HWND hOldWnd)
 {
 	ChangeCaret();
 	FocusReport(TRUE);
-	CFrameWnd::OnSetFocus(pOldWnd);
 }
 
 void CVTWindow::OnSize(UINT nType, int cx, int cy)
@@ -2863,7 +2916,7 @@
 		break;
 	}
 
-	CFrameWnd::OnSizing(fwSide, pRect);
+//TODO	CFrameWnd::OnSizing(fwSide, pRect);
 }
 
 void CVTWindow::OnSysChar(UINT nChar, UINT nRepCnt, UINT nFlags)
@@ -2876,7 +2929,7 @@
 	// ALT + x\x82\xF0\x89\x9F\x89\xBA\x82\xB7\x82\xE9\x82\xC6 WM_SYSCHAR \x82\xAA\x94\xF2\x82\xF1\x82ł\xAD\x82\xE9\x81B
 	// ALT + Enter\x82ŃE\x83B\x83\x93\x83h\x83E\x82̍ő剻 (2005.4.24 yutaka)
 	if ((nFlags&0x2000) != 0 && nChar == CR) {
-		if (IsZoomed()) { // window is maximum
+		if (::IsZoomed(m_hWnd)) { // window is maximum
 			ShowWindow(SW_RESTORE);
 		} else {
 			ShowWindow(SW_MAXIMIZE);
@@ -2915,13 +2968,16 @@
 		return;
 	}
 
-	CFrameWnd::OnSysChar(nChar, nRepCnt, nFlags);
+	CFrameWnd::DefWindowProc(WM_SYSCHAR, nChar, MAKELONG(nRepCnt, nFlags));
 }
 
+// \x89\xBD\x82\xE0\x82\xB5\x82Ă\xA2\x82Ȃ\xA2\x81A\x95s\x97v
+#if 0
 void CVTWindow::OnSysColorChange()
 {
 	CFrameWnd::OnSysColorChange();
 }
+#endif
 
 void CVTWindow::OnSysCommand(UINT nID, LPARAM lParam)
 {
@@ -2934,9 +2990,11 @@
 		// now getting host address (see CommOpen() in commlib.c)
 		::PostMessage(HVTWin,WM_SYSCOMMAND,nID,lParam);
 	}
+#if 0
 	else {
 		CFrameWnd::OnSysCommand(nID,lParam);
 	}
+#endif
 }
 
 void CVTWindow::OnSysKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags)
@@ -2960,7 +3018,7 @@
 	}
 }
 
-void CVTWindow::OnTimer(UINT nIDEvent)
+void CVTWindow::OnTimer(UINT_PTR nIDEvent)
 {
 	POINT Point;
 	WORD PortType;
@@ -3010,7 +3068,7 @@
 		case IdComEndTimer:
 			if (! CommCanClose(&cv)) {
 				// wait if received data remains
-				SetTimer(IdComEndTimer,1,NULL);
+				::SetTimer(m_hWnd, IdComEndTimer,1,NULL);
 				break;
 			}
 			cv.Ready = FALSE;
@@ -3046,7 +3104,7 @@
 	}
 }
 
-void CVTWindow::OnVScroll(UINT nSBCode, UINT nPos, CScrollBar* pScrollBar)
+void CVTWindow::OnVScroll(UINT nSBCode, UINT nPos, HWND pScrollBar)
 {
 	int Func;
 	SCROLLINFO si;
@@ -3157,12 +3215,11 @@
 		}
 		break;
 	}
-
-	return CFrameWnd::OnDeviceChange(nEventType, dwData);
+	return TRUE;
 }
 
 //<!--by AKASI
-LONG CVTWindow::OnWindowPosChanging(UINT wParam, LONG lParam)
+LRESULT CVTWindow::OnWindowPosChanging(WPARAM wParam, LPARAM lParam)
 {
 #ifdef ALPHABLEND_TYPE2
 	if(BGEnable && BGNoCopyBits) {
@@ -3173,7 +3230,7 @@
 	return CFrameWnd::DefWindowProc(WM_WINDOWPOSCHANGING,wParam,lParam);
 }
 
-LONG CVTWindow::OnSettingChange(UINT wParam, LONG lParam)
+LRESULT CVTWindow::OnSettingChange(WPARAM wParam, LPARAM lParam)
 {
 #ifdef ALPHABLEND_TYPE2
 	BGOnSettingChange();
@@ -3181,7 +3238,7 @@
 	return CFrameWnd::DefWindowProc(WM_SETTINGCHANGE,wParam,lParam);
 }
 
-LONG CVTWindow::OnEnterSizeMove(UINT wParam, LONG lParam)
+LRESULT CVTWindow::OnEnterSizeMove(WPARAM wParam, LPARAM lParam)
 {
 	EnableSizeTip(1);
 
@@ -3191,7 +3248,7 @@
 	return CFrameWnd::DefWindowProc(WM_ENTERSIZEMOVE,wParam,lParam);
 }
 
-LONG CVTWindow::OnExitSizeMove(UINT wParam, LONG lParam)
+LRESULT CVTWindow::OnExitSizeMove(WPARAM wParam, LPARAM lParam)
 {
 #ifdef ALPHABLEND_TYPE2
 	BGOnExitSizeMove();
@@ -3205,7 +3262,7 @@
 
 LRESULT CVTWindow::OnIMEStartComposition(WPARAM wParam, LPARAM lParam)
 {
-	IMEShowingCandidate = TRUE;
+	IMECompositionState = TRUE;
 
 	// \x88ʒu\x82\xF0\x92ʒm\x82\xB7\x82\xE9
 	int CaretX = (CursorX-WinOrgX)*FontWidth;
@@ -3217,7 +3274,7 @@
 
 LRESULT CVTWindow::OnIMEEndComposition(WPARAM wParam, LPARAM lParam)
 {
-	IMEShowingCandidate = FALSE;
+	IMECompositionState = FALSE;
 	return CFrameWnd::DefWindowProc(WM_IME_ENDCOMPOSITION,wParam,lParam);
 }
 
@@ -3286,16 +3343,17 @@
 	//  MS IME \x93\xFA\x96{\x8C\xEA(Windows 10 1809)	suport
 	//  Google \x93\xFA\x96{\x8C\xEA\x93\xFC\x97\xCD(2.24.3250.0)	not support
 	//
-	// WM_IME_STARTCOMPOSITION, WM_IME_ENDCOMPOSITION\x82݂̂Ŕ\xBB\x92\xE8\x89\\x82\xBE\x82\xAA
-	// \x94O\x82ׂ̈\xB1\x82̃\x81\x83b\x83Z\x81[\x83W\x82\xE0\x8F\x88\x97\x9D\x82\xB7\x82\xE9
-	case IMN_OPENCANDIDATE:
+	// WM_IME_STARTCOMPOSITION / WM_IME_ENDCOMPOSITION \x82\xCD
+	// \x8A\xBF\x8E\x9A\x93\xFC\x97͏\xF3\x91Ԃ\xAA\x83X\x83^\x81[\x83g\x82\xB5\x82\xBD / \x8FI\x97\xB9\x82\xB5\x82\xBD\x82Ŕ\xAD\x90\xB6\x82\xB7\x82\xE9\x81B
+	// IME_OPENCANDIDATE / IMN_CLOSECANDIDATE \x82\xCD
+	// \x8C\xF3\x95\xE2\x83E\x83B\x83\x93\x83h\x83E\x82\xAA\x95\\x8E\xA6\x82\xB3\x82ꂽ / \x95\xB6\x82\xBD\x82Ŕ\xAD\x90\xB6\x82\xB7\x82\xE9\x81B
+	case IMN_OPENCANDIDATE: {
 		// \x8C\xF3\x95\xE2\x83E\x83B\x83\x93\x83h\x83E\x82\xF0\x8AJ\x82\xB1\x82\xA4\x82Ƃ\xB5\x82Ă\xA2\x82\xE9
-		IMEShowingCandidate = TRUE;
+		int CaretX = (CursorX-WinOrgX)*FontWidth;
+		int CaretY = (CursorY-WinOrgY)*FontHeight;
+		SetConversionWindow(HVTWin,CaretX,CaretY);
 		break;
-	case IMN_CLOSECANDIDATE:
-		// \x8C\xF3\x95\xE2\x83E\x83B\x83\x93\x83h\x83E\x82\xF0\x95\xB6\x82悤\x82Ƃ\xB5\x82Ă\xA2\x82\xE9
-		IMEShowingCandidate = FALSE;
-		break;
+	}
 	default:
 		break;
 	}
@@ -3533,14 +3591,14 @@
 	return 0;
 }
 
-LONG CVTWindow::OnChangeTBar(UINT wParam, LONG lParam)
+LRESULT CVTWindow::OnChangeTBar(WPARAM wParam, LPARAM lParam)
 {
 	BOOL TBar;
 	DWORD Style,ExStyle;
 	HMENU SysMenu;
 
-	Style = GetWindowLong (HVTWin, GWL_STYLE);
-	ExStyle = GetWindowLong (HVTWin, GWL_EXSTYLE);
+	Style = ::GetWindowLongPtr (HVTWin, GWL_STYLE);
+	ExStyle = ::GetWindowLongPtr (HVTWin, GWL_EXSTYLE);
 	TBar = ((Style & WS_SYSMENU)!=0);
 	if (TBar == (ts.HideTitle==0)) {
 		return 0;
@@ -3576,9 +3634,9 @@
 #endif
 
 	AdjustSize = TRUE;
-	SetWindowLong(HVTWin, GWL_STYLE, Style);
+	::SetWindowLongPtr(HVTWin, GWL_STYLE, Style);
 #ifdef ALPHABLEND_TYPE2
-	SetWindowLong(HVTWin, GWL_EXSTYLE, ExStyle);
+	::SetWindowLongPtr(HVTWin, GWL_EXSTYLE, ExStyle);
 #endif
 	::SetWindowPos(HVTWin, NULL, 0, 0, 0, 0,
 	               SWP_NOMOVE | SWP_NOSIZE | SWP_NOZORDER | SWP_FRAMECHANGED);
@@ -3595,7 +3653,7 @@
 	return 0;
 }
 
-LONG CVTWindow::OnCommNotify(UINT wParam, LONG lParam)
+LRESULT CVTWindow::OnCommNotify(WPARAM wParam, LPARAM lParam)
 {
 	switch (LOWORD(lParam)) {
 		case FD_READ:  // TCP/IP
@@ -3619,13 +3677,13 @@
 			cv.OutBuffCount = 0;
 			cv.LineModeBuffCount = 0;
 			cv.FlushLen = 0;
-			SetTimer(IdComEndTimer,1,NULL);
+			::SetTimer(m_hWnd, IdComEndTimer,1,NULL);
 			break;
 	}
 	return 0;
 }
 
-LONG CVTWindow::OnCommOpen(UINT wParam, LONG lParam)
+LRESULT CVTWindow::OnCommOpen(WPARAM wParam, LPARAM lParam)
 {
 	AutoDisconnectedPort = -1;
 
@@ -3720,7 +3778,7 @@
 	return 0;
 }
 
-LONG CVTWindow::OnCommStart(UINT wParam, LONG lParam)
+LRESULT CVTWindow::OnCommStart(WPARAM wParam, LPARAM lParam)
 {
 	// \x8E\xA9\x93\xAE\x90ڑ\xB1\x82\xAA\x96\xB3\x8C\xF8\x82̂Ƃ\xAB\x82\xE0\x90ڑ\xB1\x83_\x83C\x83A\x83\x8D\x83O\x82\xF0\x8Fo\x82\xB7\x82悤\x82ɂ\xB5\x82\xBD (2006.9.15 maya)
 	if (((ts.PortType!=IdSerial) && (ts.HostName[0]==0)) ||
@@ -3746,7 +3804,7 @@
 	return 0;
 }
 
-LONG CVTWindow::OnDdeEnd(UINT wParam, LONG lParam)
+LRESULT CVTWindow::OnDdeEnd(WPARAM wParam, LPARAM lParam)
 {
 	EndDDE();
 	if (CloseTT) {
@@ -3755,42 +3813,42 @@
 	return 0;
 }
 
-LONG CVTWindow::OnDlgHelp(UINT wParam, LONG lParam)
+LRESULT CVTWindow::OnDlgHelp(WPARAM wParam, LPARAM lParam)
 {
 	OpenHelp(HH_HELP_CONTEXT, HelpId, ts.UILanguageFile);
 	return 0;
 }
 
-LONG CVTWindow::OnFileTransEnd(UINT wParam, LONG lParam)
+LRESULT CVTWindow::OnFileTransEnd(WPARAM wParam, LPARAM lParam)
 {
 	FileTransEnd(wParam);
 	return 0;
 }
 
-LONG CVTWindow::OnGetSerialNo(UINT wParam, LONG lParam)
+LRESULT CVTWindow::OnGetSerialNo(WPARAM wParam, LPARAM lParam)
 {
 	return (LONG)SerialNo;
 }
 
-LONG CVTWindow::OnKeyCode(UINT wParam, LONG lParam)
+LRESULT CVTWindow::OnKeyCode(WPARAM wParam, LPARAM lParam)
 {
 	KeyCodeSend(wParam,(WORD)lParam);
 	return 0;
 }
 
-LONG CVTWindow::OnProtoEnd(UINT wParam, LONG lParam)
+LRESULT CVTWindow::OnProtoEnd(WPARAM wParam, LPARAM lParam)
 {
 	ProtoDlgCancel();
 	return 0;
 }
 
-LONG CVTWindow::OnChangeTitle(UINT wParam, LONG lParam)
+LRESULT CVTWindow::OnChangeTitle(WPARAM wParam, LPARAM lParam)
 {
 	ChangeTitle();
 	return 0;
 }
 
-LONG CVTWindow::OnNotifyIcon(UINT wParam, LONG lParam)
+LRESULT CVTWindow::OnNotifyIcon(WPARAM wParam, LPARAM lParam)
 {
 	if (wParam == 1) {
 		switch (lParam) {
@@ -3848,6 +3906,8 @@
 		return;
 	}
 
+	SetDialogFont(ts.SetupFName,
+				  ts.UILanguageFile, "Tera Term", "DLG_SYSTEM_FONT");
 	if ((*GetHostName)(HVTWin,&GetHNRec)) {
 		if ((GetHNRec.PortType==IdTCPIP) && LoadTTSET()) {
 			if (ts.HistoryList) {
@@ -4177,11 +4237,12 @@
 
 static LRESULT CALLBACK OnCommentDlgProc(HWND hDlgWnd, UINT msg, WPARAM wp, LPARAM lp)
 {
+	static const DlgTextInfo TextInfos[] = {
+		{ 0, "DLG_COMMENT_TITLE" },
+		{ IDOK, "BTN_OK" }
+	};
 	char buf[256];
 	UINT ret;
-	LOGFONT logfont;
-	HFONT font;
-	char uimsg[MAX_UIMSG];
 
 	switch (msg) {
 		case WM_INITDIALOG:
@@ -4188,24 +4249,7 @@
 			//SetDlgItemText(hDlgWnd, IDC_EDIT_COMMENT, "\x83T\x83\x93\x83v\x83\x8B");
 			// \x83G\x83f\x83B\x83b\x83g\x83R\x83\x93\x83g\x83\x8D\x81[\x83\x8B\x82Ƀt\x83H\x81[\x83J\x83X\x82\xF0\x82\xA0\x82Ă\xE9
 			SetFocus(GetDlgItem(hDlgWnd, IDC_EDIT_COMMENT));
-
-			font = (HFONT)SendMessage(hDlgWnd, WM_GETFONT, 0, 0);
-			GetObject(font, sizeof(LOGFONT), &logfont);
-			if (get_lang_font("DLG_SYSTEM_FONT", hDlgWnd, &logfont, &DlgCommentFont, ts.UILanguageFile)) {
-				SendDlgItemMessage(hDlgWnd, IDC_EDIT_COMMENT, WM_SETFONT, (WPARAM)DlgCommentFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(hDlgWnd, IDOK, WM_SETFONT, (WPARAM)DlgCommentFont, MAKELPARAM(TRUE,0));
-			}
-			else {
-				DlgCommentFont = NULL;
-			}
-
-			GetWindowText(hDlgWnd, uimsg, sizeof(uimsg));
-			get_lang_msg("DLG_COMMENT_TITLE", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
-			SetWindowText(hDlgWnd, ts.UIMsg);
-			GetDlgItemText(hDlgWnd, IDOK, uimsg, sizeof(uimsg));
-			get_lang_msg("BTN_OK", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
-			SetDlgItemText(hDlgWnd, IDOK, ts.UIMsg);
-
+			SetDlgTexts(hDlgWnd, TextInfos, _countof(TextInfos), ts.UILanguageFile);
 			return FALSE;
 
 		case WM_COMMAND:
@@ -4212,21 +4256,18 @@
 			switch (LOWORD(wp)) {
 				case IDOK:
 					memset(buf, 0, sizeof(buf));
-					ret = GetDlgItemText(hDlgWnd, IDC_EDIT_COMMENT, buf, sizeof(buf) - 1);
+					ret = GetDlgItemTextA(hDlgWnd, IDC_EDIT_COMMENT, buf, sizeof(buf) - 1);
 					if (ret > 0) { // \x83e\x83L\x83X\x83g\x8E擾\x90\xAC\x8C\xF7
 						//buf[sizeof(buf) - 1] = '\0';  // null-terminate
 						CommentLogToFile(buf, ret);
 					}
-					if (DlgCommentFont != NULL) {
-						DeleteObject(DlgCommentFont);
-					}
-					EndDialog(hDlgWnd, IDOK);
+					TTEndDialog(hDlgWnd, IDOK);
 					break;
 				default:
 					return FALSE;
 			}
 		case WM_CLOSE:
-			EndDialog(hDlgWnd, 0);
+			TTEndDialog(hDlgWnd, 0);
 			return TRUE;
 
 		default:
@@ -4237,18 +4278,11 @@
 
 void CVTWindow::OnCommentToLog()
 {
-	DWORD ret;
-
 	// \x83\x8D\x83O\x83t\x83@\x83C\x83\x8B\x82փR\x83\x81\x83\x93\x83g\x82\xF0\x92ǉ\xC1\x82\xB7\x82\xE9 (2004.8.6 yutaka)
-	ret = DialogBox(hInst, MAKEINTRESOURCE(IDD_COMMENT_DIALOG),
-	                HVTWin, (DLGPROC)OnCommentDlgProc);
-	if (ret == 0 || ret == -1) {
-		ret = GetLastError();
-	}
-
+	TTDialogBox(hInst, MAKEINTRESOURCE(IDD_COMMENT_DIALOG),
+				HVTWin, (DLGPROC)OnCommentDlgProc);
 }
 
-
 // \x83\x8D\x83O\x82̉{\x97\x97 (2005.1.29 yutaka)
 void CVTWindow::OnViewLog()
 {
@@ -4430,6 +4464,8 @@
 	if (! LoadTTDLG()) {
 		return;
 	}
+	SetDialogFont(ts.SetupFName,
+				  ts.UILanguageFile, "Tera Term", "DLG_SYSTEM_FONT");
 	(*ChangeDirectory)(HVTWin,ts.FileDir);
 	FreeTTDLG();
 }
@@ -4566,11 +4602,12 @@
 {
 	DWORD ret;
 
-	CAddSettingPropSheetDlg CAddSetting("", CWnd::FromHandle(HVTWin));
-	CAddSetting.EnableStackedTabs(FALSE);
+	SetDialogFont(ts.SetupFName,
+				  ts.UILanguageFile, "Tera Term", "DLG_TAHOMA_FONT");
+	CAddSettingPropSheetDlg CAddSetting(hInst, _T("Tera Term: Additional settings"), HVTWin);
 	ret = CAddSetting.DoModal();
 	switch (ret) {
-		case -1:
+		case (DWORD)-1:
 		case IDABORT:
 			ret = GetLastError();
 			break;
@@ -4618,6 +4655,8 @@
 	if (! LoadTTDLG()) {
 		return;
 	}
+	SetDialogFont(ts.SetupFName,
+				  ts.UILanguageFile, "Tera Term", "DLG_SYSTEM_FONT");
 	Ok = (*SetupTerminal)(HVTWin, &ts);
 	FreeTTDLG();
 	if (Ok) {
@@ -4638,6 +4677,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();
@@ -4668,6 +4709,63 @@
 	DispSetupFontDlg();
 }
 
+static BOOL CALLBACK TFontHook(HWND Dialog, UINT Message, WPARAM wParam, LPARAM lParam)
+{
+	if (Message == WM_INITDIALOG) {
+		TCHAR uimsg[MAX_UIMSG];
+		get_lang_msgT("DLG_CHOOSEFONT_STC6", uimsg, _countof(uimsg),
+					  _T("\"Font style\" selection here won't affect actual font appearance."), ts.UILanguageFile);
+		SetDlgItemTextT(Dialog, stc6, uimsg);
+
+		SetFocus(GetDlgItem(Dialog,cmb1));
+
+		CenterWindow(Dialog, GetParent(Dialog));
+	}
+	return FALSE;
+}
+
+void CVTWindow::OnSetupDlgFont()
+{
+	LOGFONTA LogFont;
+	CHOOSEFONTA cf;
+	BOOL result;
+
+	// LogFont.lfHeight \x82\xCD point
+	result = GetI18nLogfont("Tera Term", "DlgFont", &LogFont, 0, ts.SetupFName);
+	if (result == TRUE) {
+		// pixel\x82ɕϊ\xB7
+		LogFont.lfHeight = -GetFontPixelFromPoint(m_hWnd, LogFont.lfHeight);
+	} else {
+		GetMessageboxFont(&LogFont);
+	}
+
+	memset(&cf, 0, sizeof(cf));
+	cf.lStructSize = sizeof(cf);
+	cf.hwndOwner = HVTWin;
+	cf.lpLogFont = &LogFont;
+	cf.Flags =
+		CF_SCREENFONTS | CF_INITTOLOGFONTSTRUCT |
+		CF_SHOWHELP | CF_NOVERTFONTS |
+		CF_ENABLEHOOK;
+	if (IsWindows7OrLater() && ts.ListHiddenFonts) {
+		cf.Flags |= CF_INACTIVEFONTS;
+	}
+	cf.lpfnHook = (LPCFHOOKPROC)(&TFontHook);
+	cf.nFontType = REGULAR_FONTTYPE;
+	cf.hInstance = hInst;
+	HelpId = HlpSetupFont;
+	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,
+					font_point,
+					LogFont.lfCharSet);
+		WritePrivateProfileStringA("Tera Term", "DlgFont", Temp, ts.SetupFName);
+	}
+}
+
 void CVTWindow::OnSetupKeyboard()
 {
 	BOOL Ok;
@@ -4681,6 +4779,8 @@
 	if (! LoadTTDLG()) {
 		return;
 	}
+	SetDialogFont(ts.SetupFName,
+				  ts.UILanguageFile, "Tera Term", "DLG_SYSTEM_FONT");
 	Ok = (*SetupKeyboard)(HVTWin, &ts);
 	FreeTTDLG();
 
@@ -4698,6 +4798,8 @@
 	if (! LoadTTDLG()) {
 		return;
 	}
+	SetDialogFont(ts.SetupFName,
+				  ts.UILanguageFile, "Tera Term", "DLG_SYSTEM_FONT");
 	Ok = (*SetupSerialPort)(HVTWin, &ts);
 	FreeTTDLG();
 
@@ -4723,6 +4825,8 @@
 	if (! LoadTTDLG()) {
 		return;
 	}
+	SetDialogFont(ts.SetupFName,
+				  ts.UILanguageFile, "Tera Term", "DLG_SYSTEM_FONT");
 	if ((*SetupTCPIP)(HVTWin, &ts)) {
 		TelUpdateKeepAliveInterval();
 	}
@@ -4735,6 +4839,8 @@
 	if (! LoadTTDLG()) {
 		return;
 	}
+	SetDialogFont(ts.SetupFName,
+				  ts.UILanguageFile, "Tera Term", "DLG_SYSTEM_FONT");
 	if ((*SetupGeneral)(HVTWin,&ts)) {
 		ResetCharSet();
 		ResetIME();
@@ -4776,7 +4882,7 @@
 		int w, h;
 
 #ifdef WINDOW_MAXMIMUM_ENABLED
-		if (IsZoomed()) {
+		if (::IsZoomed(m_hWnd)) {
 			w = ts.TerminalWidth;
 			h = ts.TerminalHeight;
 			ts.TerminalWidth = ts.TerminalOldWidth;
@@ -4792,7 +4898,7 @@
 		FreeTTSET();
 
 #ifdef WINDOW_MAXMIMUM_ENABLED
-		if (IsZoomed()) {
+		if (::IsZoomed(m_hWnd)) {
 			ts.TerminalWidth = w;
 			ts.TerminalHeight = h;
 		}
@@ -5014,11 +5120,18 @@
 
 static LRESULT CALLBACK OnSetupDirectoryDlgProc(HWND hDlgWnd, UINT msg, WPARAM wp, LPARAM lp)
 {
+	static const DlgTextInfo TextInfos[] = {
+		{ 0, "DLG_SETUPDIR_TITLE" },
+		{ IDC_INI_SETUPDIR_GROUP, "DLG_SETUPDIR_INIFILE" },
+		{ IDC_KEYCNF_SETUPDIR_GROUP, "DLG_SETUPDIR_KEYBOARDFILE" },
+		{ IDC_CYGTERM_SETUPDIR_GROUP, "DLG_SETUPDIR_CYGTERMFILE" },
+		{ IDC_SSH_SETUPDIR_GROUP, "DLG_SETUPDIR_KNOWNHOSTSFILE" },
+	};
 	static char teratermexepath[MAX_PATH];
 	static char inipath[MAX_PATH], inifilename[MAX_PATH], inipath_vstore[1024];
 	static char keycnfpath[MAX_PATH], keycnffilename[MAX_PATH], keycnfpath_vstore[1024];
 	static char cygtermpath[MAX_PATH], cygtermfilename[MAX_PATH], cygtermpath_vstore[1024];
-	static char eterm1path[MAX_PATH], eterm1filename[MAX_PATH], eterm1path_vstore[1024];
+//	static char eterm1path[MAX_PATH], eterm1filename[MAX_PATH], eterm1path_vstore[1024];
 	char temp[MAX_PATH];
 	char tmpbuf[1024];
 	typedef int (CALLBACK *PSSH_read_known_hosts_file)(char *, int);
@@ -5029,65 +5142,13 @@
 	BOOL open_dir, ret;
 	int button_pressed;
 	HWND hWnd;
-	LOGFONT logfont;
-	HFONT font;
-	char uimsg[MAX_UIMSG];
 
 	switch (msg) {
 	case WM_INITDIALOG:
 		// I18N
-		font = (HFONT)SendMessage(hDlgWnd, WM_GETFONT, 0, 0);
-		GetObject(font, sizeof(LOGFONT), &logfont);
-		if (get_lang_font("DLG_TAHOMA_FONT", hDlgWnd, &logfont, &DlgSetupdirFont, ts.UILanguageFile)) {
-			SendDlgItemMessage(hDlgWnd, IDC_INI_SETUPDIR_GROUP, WM_SETFONT, (WPARAM)DlgSetupdirFont, MAKELPARAM(TRUE,0));
-			SendDlgItemMessage(hDlgWnd, IDC_INI_SETUPDIR_EDIT, WM_SETFONT, (WPARAM)DlgSetupdirFont, MAKELPARAM(TRUE,0));
-			SendDlgItemMessage(hDlgWnd, IDC_INI_SETUPDIR_BUTTON, WM_SETFONT, (WPARAM)DlgSetupdirFont, MAKELPARAM(TRUE,0));
-			SendDlgItemMessage(hDlgWnd, IDC_INI_SETUPDIR_BUTTON_FILE, WM_SETFONT, (WPARAM)DlgSetupdirFont, MAKELPARAM(TRUE,0));
-			SendDlgItemMessage(hDlgWnd, IDC_INI_SETUPDIR_STATIC_VSTORE, WM_SETFONT, (WPARAM)DlgSetupdirFont, MAKELPARAM(TRUE,0));
-			SendDlgItemMessage(hDlgWnd, IDC_INI_SETUPDIR_EDIT_VSTORE, WM_SETFONT, (WPARAM)DlgSetupdirFont, MAKELPARAM(TRUE,0));
-			SendDlgItemMessage(hDlgWnd, IDC_KEYCNF_SETUPDIR_GROUP, WM_SETFONT, (WPARAM)DlgSetupdirFont, MAKELPARAM(TRUE,0));
-			SendDlgItemMessage(hDlgWnd, IDC_KEYCNF_SETUPDIR_EDIT, WM_SETFONT, (WPARAM)DlgSetupdirFont, MAKELPARAM(TRUE,0));
-			SendDlgItemMessage(hDlgWnd, IDC_KEYCNF_SETUPDIR_BUTTON, WM_SETFONT, (WPARAM)DlgSetupdirFont, MAKELPARAM(TRUE,0));
-			SendDlgItemMessage(hDlgWnd, IDC_KEYCNF_SETUPDIR_BUTTON_FILE, WM_SETFONT, (WPARAM)DlgSetupdirFont, MAKELPARAM(TRUE,0));
-			SendDlgItemMessage(hDlgWnd, IDC_KEYCNF_SETUPDIR_STATIC_VSTORE, WM_SETFONT, (WPARAM)DlgSetupdirFont, MAKELPARAM(TRUE,0));
-			SendDlgItemMessage(hDlgWnd, IDC_KEYCNF_SETUPDIR_EDIT_VSTORE, WM_SETFONT, (WPARAM)DlgSetupdirFont, MAKELPARAM(TRUE,0));
-			SendDlgItemMessage(hDlgWnd, IDC_CYGTERM_SETUPDIR_GROUP, WM_SETFONT, (WPARAM)DlgSetupdirFont, MAKELPARAM(TRUE,0));
-			SendDlgItemMessage(hDlgWnd, IDC_CYGTERM_SETUPDIR_EDIT, WM_SETFONT, (WPARAM)DlgSetupdirFont, MAKELPARAM(TRUE,0));
-			SendDlgItemMessage(hDlgWnd, IDC_CYGTERM_SETUPDIR_BUTTON, WM_SETFONT, (WPARAM)DlgSetupdirFont, MAKELPARAM(TRUE,0));
-			SendDlgItemMessage(hDlgWnd, IDC_CYGTERM_SETUPDIR_BUTTON_FILE, WM_SETFONT, (WPARAM)DlgSetupdirFont, MAKELPARAM(TRUE,0));
-			SendDlgItemMessage(hDlgWnd, IDC_CYGTERM_SETUPDIR_STATIC_VSTORE, WM_SETFONT, (WPARAM)DlgSetupdirFont, MAKELPARAM(TRUE,0));
-			SendDlgItemMessage(hDlgWnd, IDC_CYGTERM_SETUPDIR_EDIT_VSTORE, WM_SETFONT, (WPARAM)DlgSetupdirFont, MAKELPARAM(TRUE,0));
-			SendDlgItemMessage(hDlgWnd, IDC_SSH_SETUPDIR_GROUP, WM_SETFONT, (WPARAM)DlgSetupdirFont, MAKELPARAM(TRUE,0));
-			SendDlgItemMessage(hDlgWnd, IDC_SSH_SETUPDIR_EDIT, WM_SETFONT, (WPARAM)DlgSetupdirFont, MAKELPARAM(TRUE,0));
-			SendDlgItemMessage(hDlgWnd, IDC_SSH_SETUPDIR_BUTTON, WM_SETFONT, (WPARAM)DlgSetupdirFont, MAKELPARAM(TRUE,0));
-			SendDlgItemMessage(hDlgWnd, IDC_SSH_SETUPDIR_BUTTON_FILE, WM_SETFONT, (WPARAM)DlgSetupdirFont, MAKELPARAM(TRUE,0));
-			SendDlgItemMessage(hDlgWnd, IDC_SSH_SETUPDIR_STATIC_VSTORE, WM_SETFONT, (WPARAM)DlgSetupdirFont, MAKELPARAM(TRUE,0));
-			SendDlgItemMessage(hDlgWnd, IDC_SSH_SETUPDIR_EDIT_VSTORE, WM_SETFONT, (WPARAM)DlgSetupdirFont, MAKELPARAM(TRUE,0));
-		} else {
-			DlgSetupdirFont = NULL;
-		}
+		SetDlgTexts(hDlgWnd, TextInfos, _countof(TextInfos), ts.UILanguageFile);
 
-		GetWindowText(hDlgWnd, uimsg, sizeof(uimsg));
-		get_lang_msg("DLG_SETUPDIR_TITLE", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
-		SetWindowText(hDlgWnd, ts.UIMsg);
-
-		GetDlgItemText(hDlgWnd, IDC_INI_SETUPDIR_GROUP, uimsg, sizeof(uimsg));
-		get_lang_msg("DLG_SETUPDIR_INIFILE", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
-		SetDlgItemText(hDlgWnd, IDC_INI_SETUPDIR_GROUP, ts.UIMsg);
-
-		GetDlgItemText(hDlgWnd, IDC_KEYCNF_SETUPDIR_GROUP, uimsg, sizeof(uimsg));
-		get_lang_msg("DLG_SETUPDIR_KEYBOARDFILE", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
-		SetDlgItemText(hDlgWnd, IDC_KEYCNF_SETUPDIR_GROUP, ts.UIMsg);
-
-		GetDlgItemText(hDlgWnd, IDC_CYGTERM_SETUPDIR_GROUP, uimsg, sizeof(uimsg));
-		get_lang_msg("DLG_SETUPDIR_CYGTERMFILE", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
-		SetDlgItemText(hDlgWnd, IDC_CYGTERM_SETUPDIR_GROUP, ts.UIMsg);
-
-		GetDlgItemText(hDlgWnd, IDC_SSH_SETUPDIR_GROUP, uimsg, sizeof(uimsg));
-		get_lang_msg("DLG_SETUPDIR_KNOWNHOSTSFILE", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
-		SetDlgItemText(hDlgWnd, IDC_SSH_SETUPDIR_GROUP, ts.UIMsg);
-
-		if (GetModuleFileName(NULL, temp, sizeof(temp)) != 0) {
+		if (GetModuleFileNameA(NULL, temp, sizeof(temp)) != 0) {
 			ExtractDirName(temp, teratermexepath);
 		}
 
@@ -5301,10 +5362,7 @@
 			break;
 
 		case IDCANCEL:
-			if (DlgSetupdirFont != NULL) {
-				DeleteObject(DlgSetupdirFont);
-			}
-			EndDialog(hDlgWnd, IDCANCEL);
+			TTEndDialog(hDlgWnd, IDCANCEL);
 			break;
 
 		default:
@@ -5324,7 +5382,7 @@
 		}
 
 	case WM_CLOSE:
-		EndDialog(hDlgWnd, 0);
+		TTEndDialog(hDlgWnd, 0);
 		return TRUE;
 
 	default:
@@ -5341,11 +5399,8 @@
 //
 void CVTWindow::OnOpenSetupDirectory()
 {
-	int ret;
-
-	ret = DialogBox(hInst, MAKEINTRESOURCE(IDD_SETUP_DIR_DIALOG),
-		HVTWin, (DLGPROC)OnSetupDirectoryDlgProc);
-
+	TTDialogBox(hInst, MAKEINTRESOURCE(IDD_SETUP_DIR_DIALOG),
+	            HVTWin, (DLGPROC)OnSetupDirectoryDlgProc);
 }
 
 void CVTWindow::OnSetupLoadKeyMap()
@@ -5664,13 +5719,19 @@
 //
 static LRESULT CALLBACK BroadcastCommandDlgProc(HWND hWnd, UINT msg, WPARAM wp, LPARAM lp)
 {
+	static const DlgTextInfo TextInfos[] = {
+		{ 0, "DLG_BROADCAST_TITLE" },
+		{ IDC_HISTORY_CHECK, "DLG_BROADCAST_HISTORY" },
+		{ IDC_ENTERKEY_CHECK, "DLG_BROADCAST_ENTER" },
+		{ IDC_PARENT_ONLY, "DLG_BROADCAST_PARENTONLY" },
+		{ IDC_REALTIME_CHECK, "DLG_BROADCAST_REALTIME" },
+		{ IDOK, "DLG_BROADCAST_SUBMIT" },
+		{ IDCANCEL, "BTN_CLOSE" },
+	};
 	char buf[256 + 3];
 	UINT ret;
 	LRESULT checked;
 	LRESULT history;
-	LOGFONT logfont;
-	HFONT font;
-	char uimsg[MAX_UIMSG];
 	char historyfile[MAX_PATH];
 	static HWND hwndBroadcast     = NULL; // Broadcast dropdown
 	static HWND hwndBroadcastEdit = NULL; // Edit control on Broadcast dropdown
@@ -5713,8 +5774,8 @@
 			// \x83T\x83u\x83N\x83\x89\x83X\x89\xBB\x82\xB3\x82\xB9\x82ă\x8A\x83A\x83\x8B\x83^\x83C\x83\x80\x83\x82\x81[\x83h\x82ɂ\xB7\x82\xE9 (2008.1.21 yutaka)
 			hwndBroadcast = GetDlgItem(hWnd, IDC_COMMAND_EDIT);
 			hwndBroadcastEdit = GetWindow(hwndBroadcast, GW_CHILD);
-			OrigBroadcastEditProc = (WNDPROC)GetWindowLong(hwndBroadcastEdit, GWL_WNDPROC);
-			SetWindowLong(hwndBroadcastEdit, GWL_WNDPROC, (LONG)BroadcastEditProc);
+			OrigBroadcastEditProc = (WNDPROC)GetWindowLongPtr(hwndBroadcastEdit, GWLP_WNDPROC);
+			SetWindowLongPtr(hwndBroadcastEdit, GWLP_WNDPROC, (LONG_PTR)BroadcastEditProc);
 			// \x83f\x83t\x83H\x83\x8B\x83g\x82\xCDon\x81B\x8Ec\x82\xE8\x82\xCDdisable\x81B
 			SendMessage(GetDlgItem(hWnd, IDC_REALTIME_CHECK), BM_SETCHECK, BST_CHECKED, 0);  // default on
 			EnableWindow(GetDlgItem(hWnd, IDC_HISTORY_CHECK), FALSE);
@@ -5728,44 +5789,8 @@
 			BroadcastWindowList = GetDlgItem(hWnd, IDC_LIST);
 			UpdateBroadcastWindowList(BroadcastWindowList);
 
-			font = (HFONT)SendMessage(hWnd, WM_GETFONT, 0, 0);
-			GetObject(font, sizeof(LOGFONT), &logfont);
-			if (get_lang_font("DLG_SYSTEM_FONT", hWnd, &logfont, &DlgBroadcastFont, ts.UILanguageFile)) {
-				SendDlgItemMessage(hWnd, IDC_COMMAND_EDIT, WM_SETFONT, (WPARAM)DlgBroadcastFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(hWnd, IDC_HISTORY_CHECK, WM_SETFONT, (WPARAM)DlgBroadcastFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(hWnd, IDC_RADIO_CRLF, WM_SETFONT, (WPARAM)DlgBroadcastFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(hWnd, IDC_RADIO_CR, WM_SETFONT, (WPARAM)DlgBroadcastFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(hWnd, IDC_RADIO_LF, WM_SETFONT, (WPARAM)DlgBroadcastFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(hWnd, IDC_ENTERKEY_CHECK, WM_SETFONT, (WPARAM)DlgBroadcastFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(hWnd, IDC_PARENT_ONLY, WM_SETFONT, (WPARAM)DlgBroadcastFont, MAKELPARAM(TRUE,0));	// 337: 2007/03/20
-				SendDlgItemMessage(hWnd, IDC_REALTIME_CHECK, WM_SETFONT, (WPARAM)DlgBroadcastFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(hWnd, IDOK, WM_SETFONT, (WPARAM)DlgBroadcastFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(hWnd, IDCANCEL, WM_SETFONT, (WPARAM)DlgBroadcastFont, MAKELPARAM(TRUE,0));
-			}
-			else {
-				DlgBroadcastFont = NULL;
-			}
-			GetWindowText(hWnd, uimsg, sizeof(uimsg));
-			get_lang_msg("DLG_BROADCAST_TITLE", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
-			SetWindowText(hWnd, ts.UIMsg);
-			GetDlgItemText(hWnd, IDC_HISTORY_CHECK, uimsg, sizeof(uimsg));
-			get_lang_msg("DLG_BROADCAST_HISTORY", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
-			SetDlgItemText(hWnd, IDC_HISTORY_CHECK, ts.UIMsg);
-			GetDlgItemText(hWnd, IDC_ENTERKEY_CHECK, uimsg, sizeof(uimsg));
-			get_lang_msg("DLG_BROADCAST_ENTER", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
-			SetDlgItemText(hWnd, IDC_ENTERKEY_CHECK, ts.UIMsg);
-			GetDlgItemText(hWnd, IDC_PARENT_ONLY, uimsg, sizeof(uimsg));
-			get_lang_msg("DLG_BROADCAST_PARENTONLY", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
-			SetDlgItemText(hWnd, IDC_PARENT_ONLY, ts.UIMsg);
-			GetDlgItemText(hWnd, IDC_REALTIME_CHECK, uimsg, sizeof(uimsg));
-			get_lang_msg("DLG_BROADCAST_REALTIME", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
-			SetDlgItemText(hWnd, IDC_REALTIME_CHECK, ts.UIMsg);
-			GetDlgItemText(hWnd, IDOK, uimsg, sizeof(uimsg));
-			get_lang_msg("DLG_BROADCAST_SUBMIT", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
-			SetDlgItemText(hWnd, IDOK, ts.UIMsg);
-			GetDlgItemText(hWnd, IDCANCEL, uimsg, sizeof(uimsg));
-			get_lang_msg("BTN_CLOSE", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
-			SetDlgItemText(hWnd, IDCANCEL, ts.UIMsg);
+			// I18N
+			SetDlgTexts(hWnd, TextInfos, _countof(TextInfos), ts.UILanguageFile);
 
 			// \x83_\x83C\x83A\x83\x8D\x83O\x82̏\x89\x8A\xFA\x83T\x83C\x83Y\x82\xF0\x95ۑ\xB6
 			GetWindowRect(hWnd, &rc_dlg);
@@ -5825,8 +5850,8 @@
 					// new handler
 					hwndBroadcast = GetDlgItem(hWnd, IDC_COMMAND_EDIT);
 					hwndBroadcastEdit = GetWindow(hwndBroadcast, GW_CHILD);
-					OrigBroadcastEditProc = (WNDPROC)GetWindowLong(hwndBroadcastEdit, GWL_WNDPROC);
-					SetWindowLong(hwndBroadcastEdit, GWL_WNDPROC, (LONG)BroadcastEditProc);
+					OrigBroadcastEditProc = (WNDPROC)GetWindowLongPtr(hwndBroadcastEdit, GWLP_WNDPROC);
+					SetWindowLongPtr(hwndBroadcastEdit, GWLP_WNDPROC, (LONG_PTR)BroadcastEditProc);
 
 					EnableWindow(GetDlgItem(hWnd, IDC_HISTORY_CHECK), FALSE);
 					EnableWindow(GetDlgItem(hWnd, IDC_RADIO_CRLF), FALSE);
@@ -5837,7 +5862,7 @@
 					EnableWindow(GetDlgItem(hWnd, IDC_LIST), TRUE);  // true
 				} else {
 					// restore old handler
-					SetWindowLong(hwndBroadcastEdit, GWL_WNDPROC, (LONG)OrigBroadcastEditProc);
+					SetWindowLongPtr(hwndBroadcastEdit, GWLP_WNDPROC, (LONG_PTR)OrigBroadcastEditProc);
 
 					EnableWindow(GetDlgItem(hWnd, IDC_HISTORY_CHECK), TRUE);
 					EnableWindow(GetDlgItem(hWnd, IDC_RADIO_CRLF), TRUE);
@@ -5912,7 +5937,7 @@
 					// \x83\x82\x81[\x83h\x83\x8C\x83X\x83_\x83C\x83A\x83\x8D\x83O\x82͈\xEA\x93x\x90\xB6\x90\xAC\x82\xB3\x82\xEA\x82\xE9\x82ƁA\x83A\x83v\x83\x8A\x83P\x81[\x83V\x83\x87\x83\x93\x82\xAA\x8FI\x97\xB9\x82\xB7\x82\xE9\x82܂\xC5
 					// \x94j\x8A\xFC\x82\xB3\x82\xEA\x82Ȃ\xA2\x82̂ŁA\x88ȉ\xBA\x82́u\x83E\x83B\x83\x93\x83h\x83E\x83v\x83\x8D\x83V\x81[\x83W\x83\x83\x96߂\xB5\x81v\x82͕s\x97v\x82Ǝv\x82\xED\x82\xEA\x82\xE9\x81B(yutaka)
 #if 0
-					SetWindowLong(hwndBroadcastEdit, GWL_WNDPROC, (LONG)OrigBroadcastEditProc);
+					SetWindowLongPtr(hwndBroadcastEdit, GWLP_WNDPROC, (LONG_PTR)OrigBroadcastEditProc);
 #endif
 
 					//EndDialog(hDlgWnd, IDOK);
@@ -5964,9 +5989,6 @@
 		case WM_CLOSE:
 			//DestroyWindow(hWnd);
 			EndDialog(hWnd, 0);
-			if (DlgBroadcastFont != NULL) {
-				DeleteObject(DlgBroadcastFont);
-			}
 			return TRUE;
 
 		case WM_SIZE:
@@ -6164,7 +6186,7 @@
 	// \x82\xE6\x82\xC1\x82čs\x82\xED\x82\xEA\x82\xE9\x81B
 	// \x82\xB5\x82\xA9\x82\xB5\x94\xF1\x83A\x83N\x83e\x83B\x83u\x82ȃE\x83B\x83\x93\x83h\x83E\x82ł\xCD OnIdle() \x82\xAA\x8CĂ΂\xEA\x82Ȃ\xA2\x82̂ŁA
 	// \x8B\xF3\x82̃\x81\x83b\x83Z\x81[\x83W\x82𑗂\xC1\x82\xC4 OnIdle() \x82\xAA\x8CĂ΂\xEA\x82\xE9\x82悤\x82ɂ\xB7\x82\xE9\x81B
-	PostMessage(WM_NULL, 0, 0);
+	::PostMessage(m_hWnd, WM_NULL, 0, 0);
 
 	return 1; // \x91\x97\x90M\x82ł\xAB\x82\xBD\x8Fꍇ\x82\xCD1\x82\xF0\x95Ԃ\xB7
 }
@@ -6203,6 +6225,8 @@
 	if (! LoadTTDLG()) {
 		return;
 	}
+	SetDialogFont(ts.SetupFName,
+				  ts.UILanguageFile, "Tera Term", "DLG_SYSTEM_FONT");
 	(*WindowWindow)(HVTWin,&Close);
 	FreeTTDLG();
 	if (Close) {
@@ -6250,6 +6274,339 @@
 	if (! LoadTTDLG()) {
 		return;
 	}
+	SetDialogFont(ts.SetupFName,
+				  ts.UILanguageFile, "Tera Term", "DLG_SYSTEM_FONT");
 	(*AboutDialog)(HVTWin);
 	FreeTTDLG();
 }
+
+LRESULT CVTWindow::OnDpiChanged(WPARAM wParam, LPARAM lParam)
+{
+	static DWORD preTime = 0;
+	DWORD currentTime = GetTickCount();
+	if (currentTime - preTime < 1000) {
+		return 0;
+	}
+	preTime = currentTime;
+
+	DpiChanged();
+	return TRUE;
+}
+
+LRESULT CVTWindow::Proc(UINT msg, WPARAM wp, LPARAM lp)
+{
+	LRESULT retval = 0;
+	if (msg == MsgDlgHelp) {
+		OnDlgHelp(wp,lp);
+		return 0;
+	}
+	switch(msg)
+	{
+	case WM_ACTIVATE:
+		OnActivate(wp & 0xFFFF, (HWND)wp, (wp >> 16) & 0xFFFF);
+		break;
+	case WM_CHAR:
+		OnChar(wp, LOWORD(lp), HIWORD(lp));
+		break;
+	case WM_CLOSE:
+		OnClose();
+		break;
+	case WM_DESTROY:
+		OnDestroy();
+		PostQuitMessage(0);
+		break;
+	case WM_DROPFILES:
+		OnDropFiles((HDROP)wp);
+		break;
+	case WM_GETMINMAXINFO:
+		OnGetMinMaxInfo((MINMAXINFO *)lp);
+		break;
+	case WM_HSCROLL:
+		OnHScroll(LOWORD(wp), HIWORD(wp), (HWND)lp);
+		break;
+	case WM_INITMENUPOPUP:
+		OnInitMenuPopup((HMENU)wp, LOWORD(lp), HIWORD(lp));
+		break;
+	case WM_KEYDOWN:
+		OnKeyDown(wp, LOWORD(lp), HIWORD(lp));
+		break;
+	case WM_KEYUP:
+		OnKeyUp(wp, LOWORD(lp), HIWORD(lp));
+		break;
+	case WM_KILLFOCUS:
+		OnKillFocus((HWND)wp);
+		break;
+	case WM_LBUTTONDBLCLK:
+		OnLButtonDblClk(wp, MAKEPOINTS(lp));
+		break;
+	case WM_LBUTTONDOWN:
+		OnLButtonDown(wp, MAKEPOINTS(lp));
+		break;
+	case WM_LBUTTONUP:
+		OnLButtonUp(wp, MAKEPOINTS(lp));
+		break;
+	case WM_MBUTTONDOWN:
+		OnMButtonDown(wp, MAKEPOINTS(lp));
+		break;
+	case WM_MBUTTONUP:
+		OnMButtonUp(wp, MAKEPOINTS(lp));
+		break;
+	case WM_MOUSEACTIVATE:
+		OnMouseActivate((HWND)wp, LOWORD(lp), HIWORD(lp));
+		break;
+	case WM_MOUSEMOVE:
+		OnMouseMove(wp, MAKEPOINTS(lp));
+		break;
+	case WM_MOUSEWHEEL:
+		OnMouseWheel(GET_KEYSTATE_WPARAM(wp), GET_WHEEL_DELTA_WPARAM(wp), MAKEPOINTS(lp));
+		break;
+	case WM_MOVE:
+		OnMove(LOWORD(lp), HIWORD(lp));
+		break;
+	case WM_NCLBUTTONDBLCLK:
+		OnNcLButtonDblClk((UINT)wp, MAKEPOINTS(lp));
+		DefWindowProc(msg, wp, lp);
+		break;
+	case WM_NCRBUTTONDOWN:
+		OnNcRButtonDown((UINT)wp, MAKEPOINTS(lp));
+		break;
+#if 0
+		// \x89\xBD\x82\xE0\x82\xB5\x82Ă\xA2\x82Ȃ\xA2
+	case WM_NCCALCSIZE:
+		break;
+#endif
+	case WM_PAINT:
+		OnPaint();
+		break;
+	case WM_RBUTTONDOWN:
+		OnRButtonDown((UINT)wp, MAKEPOINTS(lp));
+		break;
+	case WM_RBUTTONUP:
+		OnRButtonUp((UINT)wp, MAKEPOINTS(lp));
+		break;
+	case WM_SETFOCUS:
+		OnSetFocus((HWND)wp);
+		DefWindowProc(msg, wp, lp);
+		break;
+	case WM_SIZE:
+		OnSize(wp, LOWORD(lp), HIWORD(lp));
+		break;
+	case WM_SIZING:
+		OnSizing(wp, (LPRECT)lp);
+		break;
+#if 1
+	case WM_SYSCHAR:
+		OnSysChar(wp, LOWORD(lp), HIWORD(lp));
+		break;
+#endif
+#if 0	// \x89\xBD\x82\xE0\x82\xB5\x82Ă\xA2\x82Ȃ\xA2\x81A\x95s\x97v
+	case WM_SYSCOLORCHANGE:
+		break;
+#endif
+	case WM_SYSCOMMAND:
+		OnSysCommand(wp, lp);
+		DefWindowProc(msg, wp, lp);
+		break;
+	case WM_SYSKEYDOWN:
+		OnSysKeyDown(wp, LOWORD(lp), HIWORD(lp));
+		break;
+	case WM_SYSKEYUP:
+		OnSysKeyUp(wp, LOWORD(lp), HIWORD(lp));
+		break;
+	case WM_TIMER:
+		OnTimer(wp);
+		break;
+	case WM_VSCROLL:
+		OnVScroll(LOWORD(wp), HIWORD(wp), (HWND)lp);
+		break;
+	case WM_DEVICECHANGE:
+		OnDeviceChange((UINT)wp, (DWORD_PTR)lp);
+		DefWindowProc(msg, wp, lp);
+		break;
+	case WM_IME_STARTCOMPOSITION :
+		OnIMEStartComposition(wp, lp);
+		break;
+	case WM_IME_ENDCOMPOSITION :
+		OnIMEEndComposition(wp, lp);
+		break;
+	case WM_IME_COMPOSITION:
+		OnIMEComposition(wp, lp);
+		break;
+	case WM_INPUTLANGCHANGE:
+		OnIMEInputChange(wp, lp);
+		break;
+	case WM_IME_NOTIFY:
+		OnIMENotify(wp, lp);
+		break;
+	case WM_IME_REQUEST:
+		OnIMERequest(wp, lp);
+		break;
+	case WM_WINDOWPOSCHANGING:
+		OnWindowPosChanging(wp, lp);
+		break;
+	case WM_SETTINGCHANGE:
+		OnSettingChange(wp, lp);
+		break;
+	case WM_ENTERSIZEMOVE:
+		OnEnterSizeMove(wp, lp);
+		break;
+	case WM_EXITSIZEMOVE :
+		OnExitSizeMove(wp, lp);
+		break;
+	case WM_USER_ACCELCOMMAND:
+		OnAccelCommand(wp, lp);
+		break;
+	case WM_USER_CHANGEMENU:
+		OnChangeMenu(wp, lp);
+		break;
+	case WM_USER_CHANGETBAR:
+		OnChangeTBar(wp, lp);
+		break;
+	case WM_USER_COMMNOTIFY:
+		OnCommNotify(wp, lp);
+		break;
+	case WM_USER_COMMOPEN:
+		OnCommOpen(wp, lp);
+		break;
+	case WM_USER_COMMSTART:
+		OnCommStart(wp, lp);
+		break;
+	case WM_USER_DDEEND:
+		OnDdeEnd(wp, lp);
+		break;
+	case WM_USER_DLGHELP2:
+		OnDlgHelp(wp, lp);
+		break;
+	case WM_USER_FTCANCEL:
+		OnFileTransEnd(wp, lp);
+		break;
+	case WM_USER_GETSERIALNO:
+		OnGetSerialNo(wp, lp);
+		break;
+	case WM_USER_KEYCODE:
+		OnKeyCode(wp, lp);
+		break;
+	case WM_USER_PROTOCANCEL:
+		OnProtoEnd(wp, lp);
+		break;
+	case WM_USER_CHANGETITLE:
+		OnChangeTitle(wp, lp);
+		break;
+	case WM_COPYDATA:
+		OnReceiveIpcMessage(wp, lp);
+		break;
+	case WM_USER_NONCONFIRM_CLOSE:
+		OnNonConfirmClose(wp, lp);
+		break;
+	case WM_USER_NOTIFYICON:
+		OnNotifyIcon(wp, lp);
+		break;
+	case WM_USER_DROPNOTIFY:
+		OnDropNotify(wp, lp);
+		break;
+	case WM_DPICHANGED:
+		OnDpiChanged(wp, lp);
+		break;
+	case WM_COMMAND:
+	{
+		const WORD wID = GET_WM_COMMAND_ID(wp, lp);
+		switch (wID) {
+		case ID_FILE_NEWCONNECTION: OnFileNewConnection(); break;
+		case ID_FILE_DUPLICATESESSION: OnDuplicateSession(); break;
+		case ID_FILE_CYGWINCONNECTION: OnCygwinConnection(); break;
+		case ID_FILE_TERATERMMENU: OnTTMenuLaunch(); break;
+		case ID_FILE_LOGMEIN: OnLogMeInLaunch(); break;
+		case ID_FILE_LOG: OnFileLog(); break;
+		case ID_FILE_COMMENTTOLOG: OnCommentToLog(); break;
+		case ID_FILE_VIEWLOG: OnViewLog(); break;
+		case ID_FILE_SHOWLOGDIALOG: OnShowLogDialog(); break;
+		case ID_FILE_REPLAYLOG: OnReplayLog(); break;
+		case ID_FILE_SENDFILE: OnFileSend(); break;
+		case ID_FILE_KERMITRCV: OnFileKermitRcv(); break;
+		case ID_FILE_KERMITGET: OnFileKermitGet(); break;
+		case ID_FILE_KERMITSEND: OnFileKermitSend(); break;
+		case ID_FILE_KERMITFINISH: OnFileKermitFinish(); break;
+		case ID_FILE_XRCV: OnFileXRcv(); break;
+		case ID_FILE_XSEND: OnFileXSend(); break;
+		case ID_FILE_YRCV: OnFileYRcv(); break;
+		case ID_FILE_YSEND: OnFileYSend(); break;
+		case ID_FILE_ZRCV: OnFileZRcv(); break;
+		case ID_FILE_ZSEND: OnFileZSend(); break;
+		case ID_FILE_BPRCV: OnFileBPRcv(); break;
+		case ID_FILE_BPSEND: OnFileBPSend(); break;
+		case ID_FILE_QVRCV: OnFileQVRcv(); break;
+		case ID_FILE_QVSEND: OnFileQVSend(); break;
+		case ID_FILE_CHANGEDIR: OnFileChangeDir(); break;
+		case ID_FILE_PRINT2: OnFilePrint(); break;
+		case ID_FILE_DISCONNECT: OnFileDisconnect(); break;
+		case ID_FILE_EXIT: OnFileExit(); break;
+		case ID_FILE_EXITALL: OnAllClose(); break;
+		case ID_EDIT_COPY2: OnEditCopy(); break;
+		case ID_EDIT_COPYTABLE: OnEditCopyTable(); break;
+		case ID_EDIT_PASTE2: OnEditPaste(); break;
+		case ID_EDIT_PASTECR: OnEditPasteCR(); break;
+		case ID_EDIT_CLEARSCREEN: OnEditClearScreen(); break;
+		case ID_EDIT_CLEARBUFFER: OnEditClearBuffer(); break;
+		case ID_EDIT_CANCELSELECT: OnEditCancelSelection(); break;
+		case ID_EDIT_SELECTALL: OnEditSelectAllBuffer(); break;
+		case ID_EDIT_SELECTSCREEN: OnEditSelectScreenBuffer(); break;
+		case ID_SETUP_ADDITIONALSETTINGS: OnExternalSetup(); break;
+		case ID_SETUP_TERMINAL: OnSetupTerminal(); break;
+		case ID_SETUP_WINDOW: OnSetupWindow(); break;
+		case ID_SETUP_FONT: OnSetupFont(); break;
+		case ID_SETUP_DLG_FONT: OnSetupDlgFont(); break;
+		case ID_SETUP_KEYBOARD: OnSetupKeyboard(); break;
+		case ID_SETUP_SERIALPORT: OnSetupSerialPort(); break;
+		case ID_SETUP_TCPIP: OnSetupTCPIP(); break;
+		case ID_SETUP_GENERAL: OnSetupGeneral(); break;
+		case ID_SETUP_SAVE: OnSetupSave(); break;
+		case ID_SETUP_RESTORE: OnSetupRestore(); break;
+		case ID_OPEN_SETUP: OnOpenSetupDirectory(); break;
+		case ID_SETUP_LOADKEYMAP: OnSetupLoadKeyMap(); break;
+		case ID_CONTROL_RESETTERMINAL: OnControlResetTerminal(); break;
+		case ID_CONTROL_RESETREMOTETITLE: OnControlResetRemoteTitle(); break;
+		case ID_CONTROL_AREYOUTHERE: OnControlAreYouThere(); break;
+		case ID_CONTROL_SENDBREAK: OnControlSendBreak(); break;
+		case ID_CONTROL_RESETPORT: OnControlResetPort(); break;
+		case ID_CONTROL_BROADCASTCOMMAND: OnControlBroadcastCommand(); break;
+		case ID_CONTROL_OPENTEK: OnControlOpenTEK(); break;
+		case ID_CONTROL_CLOSETEK: OnControlCloseTEK(); break;
+		case ID_CONTROL_MACRO: OnControlMacro(); break;
+		case ID_CONTROL_SHOW_MACRO: OnShowMacroWindow(); break;
+		case ID_WINDOW_WINDOW: OnWindowWindow(); break;
+		case ID_WINDOW_MINIMIZEALL: OnWindowMinimizeAll(); break;
+		case ID_WINDOW_CASCADEALL: OnWindowCascade(); break;
+		case ID_WINDOW_STACKED: OnWindowStacked(); break;
+		case ID_WINDOW_SIDEBYSIDE: OnWindowSidebySide(); break;
+		case ID_WINDOW_RESTOREALL: OnWindowRestoreAll(); break;
+		case ID_WINDOW_UNDO: OnWindowUndo(); break;
+		case ID_HELP_INDEX2: OnHelpIndex(); break;
+		case ID_HELP_ABOUT: OnHelpAbout(); break;
+		default:
+			OnCommand(wp, lp);
+			break;
+		}
+		break;
+	}
+	case WM_NCHITTEST: {
+		retval = CFrameWnd::DefWindowProc(msg, wp ,lp);
+		if (ts.HideTitle>0) {
+			if ((retval == HTCLIENT) && AltKey()) {
+#ifdef ALPHABLEND_TYPE2
+			if(ShiftKey())
+				retval = HTBOTTOMRIGHT;
+			else
+				retval = HTCAPTION;
+#else
+			retval = HTCAPTION;
+#endif
+			}
+		}
+	}
+		break;
+	default:
+		retval = DefWindowProc(msg, wp, lp);
+		break;
+	}
+	return retval;
+}

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

Modified: branches/ssh_auth_dialog/teraterm/teraterm/winjump.c
===================================================================
--- branches/ssh_auth_dialog/teraterm/teraterm/winjump.c	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/teraterm/teraterm/winjump.c	2019-04-24 14:08:16 UTC (rev 7613)
@@ -46,16 +46,25 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include "teraterm_conf.h"
+
 #include <windows.h>
 #include <assert.h>
 #include <stdio.h>
 #include <string.h>
 #include <shlobj.h>
+#include <crtdbg.h>
 
 #include "winjump.h"
 #include "teraterm.h"
 #include "tttypes.h"
 
+#ifdef _DEBUG
+#define malloc(l)	_malloc_dbg((l), _NORMAL_BLOCK, __FILE__, __LINE__)
+#define free(p)		_free_dbg((p), _NORMAL_BLOCK)
+#define _strdup(s)	_strdup_dbg(s, _NORMAL_BLOCK, __FILE__, __LINE__)
+#endif
+
 #define MAX_JUMPLIST_ITEMS 30 /* PuTTY will never show more items in
                                * the jumplist than this, regardless of
                                * user preferences. */
@@ -368,6 +377,7 @@
 } IPropertyStore;
 #endif
 
+#if !defined(__MINGW32__)
 static const CLSID CLSID_DestinationList = {
     0x77f10cf0, 0x3db5, 0x4966, {0xb5,0x20,0xb7,0xc5,0x4f,0xd3,0x5e,0xd6}
 };
@@ -383,9 +393,13 @@
 static const IID IID_IShellLink = {
     0x000214ee, 0x0000, 0x0000, {0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46}
 };
+#endif
+#if (_WIN32_WINNT < 0x0601)		// _WIN32_WINNT_WIN7
 static const IID IID_ICustomDestinationList = {
     0x6332debf, 0x87b5, 0x4670, {0x90,0xc0,0x5e,0x57,0xb4,0x08,0xa4,0x9e}
 };
+#endif
+#if !defined(__MINGW32__)
 static const IID IID_IObjectArray = {
     0x92ca9dcd, 0x5622, 0x4bba, {0xa8,0x05,0x5e,0x9f,0x54,0x1b,0xd8,0xc9}
 };
@@ -392,6 +406,7 @@
 static const IID IID_IPropertyStore = {
     0x886d8eeb, 0x8cf2, 0x4446, {0x8d,0x02,0xcd,0xba,0x1d,0xbd,0xcf,0x99}
 };
+#endif
 static const PROPERTYKEY PKEY_Title = {
     {0xf29f85e0, 0x4ff9, 0x1068, {0xab,0x91,0x08,0x00,0x2b,0x27,0xb3,0xd9}},
     0x00000002

Modified: branches/ssh_auth_dialog/teraterm/ttermpro.sln
===================================================================
--- branches/ssh_auth_dialog/teraterm/ttermpro.sln	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/teraterm/ttermpro.sln	2019-04-24 14:08:16 UTC (rev 7613)
@@ -2,12 +2,12 @@
 # Visual Studio 2005
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ttermpro", "teraterm\ttermpro.vcproj", "{BC4CDBE3-6269-47A8-BD74-EEB3A6160E06}"
 	ProjectSection(ProjectDependencies) = postProject
-		{47CB840D-85C8-460F-9101-BEB54BEF9D56} = {47CB840D-85C8-460F-9101-BEB54BEF9D56}
 		{BA519362-A2C2-4B1A-905B-F00791F9038A} = {BA519362-A2C2-4B1A-905B-F00791F9038A}
 		{5CF58947-E861-4A5C-B0B1-E85486F149CD} = {5CF58947-E861-4A5C-B0B1-E85486F149CD}
 		{6D08053B-1C68-4A7E-8766-3553F5AF010B} = {6D08053B-1C68-4A7E-8766-3553F5AF010B}
 		{118E0D32-5553-4F73-9927-E873C1C500E4} = {118E0D32-5553-4F73-9927-E873C1C500E4}
 		{311F2B21-AEC4-4384-8209-BB83B54749B4} = {311F2B21-AEC4-4384-8209-BB83B54749B4}
+		{80F1C3F0-A213-4D48-85C8-A265990D19A7} = {80F1C3F0-A213-4D48-85C8-A265990D19A7}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "keycode", "keycode\keycode.vcproj", "{B31BF2E8-79E6-4735-BEA2-C1B4041C2D2E}"
@@ -14,12 +14,6 @@
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ttpcmn", "ttpcmn\ttpcmn.vcproj", "{118E0D32-5553-4F73-9927-E873C1C500E4}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ttpdlg", "ttpdlg\ttpdlg.vcproj", "{47CB840D-85C8-460F-9101-BEB54BEF9D56}"
-	ProjectSection(ProjectDependencies) = postProject
-		{80F1C3F0-A213-4D48-85C8-A265990D19A7} = {80F1C3F0-A213-4D48-85C8-A265990D19A7}
-		{118E0D32-5553-4F73-9927-E873C1C500E4} = {118E0D32-5553-4F73-9927-E873C1C500E4}
-	EndProjectSection
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ttpfile", "ttpfile\ttpfile.vcproj", "{311F2B21-AEC4-4384-8209-BB83B54749B4}"
 	ProjectSection(ProjectDependencies) = postProject
 		{118E0D32-5553-4F73-9927-E873C1C500E4} = {118E0D32-5553-4F73-9927-E873C1C500E4}
@@ -60,10 +54,6 @@
 		{118E0D32-5553-4F73-9927-E873C1C500E4}.Debug|Win32.Build.0 = Debug|Win32
 		{118E0D32-5553-4F73-9927-E873C1C500E4}.Release|Win32.ActiveCfg = Release|Win32
 		{118E0D32-5553-4F73-9927-E873C1C500E4}.Release|Win32.Build.0 = Release|Win32
-		{47CB840D-85C8-460F-9101-BEB54BEF9D56}.Debug|Win32.ActiveCfg = Debug|Win32
-		{47CB840D-85C8-460F-9101-BEB54BEF9D56}.Debug|Win32.Build.0 = Debug|Win32
-		{47CB840D-85C8-460F-9101-BEB54BEF9D56}.Release|Win32.ActiveCfg = Release|Win32
-		{47CB840D-85C8-460F-9101-BEB54BEF9D56}.Release|Win32.Build.0 = Release|Win32
 		{311F2B21-AEC4-4384-8209-BB83B54749B4}.Debug|Win32.ActiveCfg = Debug|Win32
 		{311F2B21-AEC4-4384-8209-BB83B54749B4}.Debug|Win32.Build.0 = Debug|Win32
 		{311F2B21-AEC4-4384-8209-BB83B54749B4}.Release|Win32.ActiveCfg = Release|Win32

Modified: branches/ssh_auth_dialog/teraterm/ttermpro.v10.sln
===================================================================
--- branches/ssh_auth_dialog/teraterm/ttermpro.v10.sln	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/teraterm/ttermpro.v10.sln	2019-04-24 14:08:16 UTC (rev 7613)
@@ -6,8 +6,6 @@
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ttpcmn", "ttpcmn\ttpcmn.v10.vcxproj", "{118E0D32-5553-4F73-9927-E873C1C500E4}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ttpdlg", "ttpdlg\ttpdlg.v10.vcxproj", "{47CB840D-85C8-460F-9101-BEB54BEF9D56}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ttpfile", "ttpfile\ttpfile.v10.vcxproj", "{311F2B21-AEC4-4384-8209-BB83B54749B4}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ttpmacro", "ttpmacro\ttpmacro.v10.vcxproj", "{BA519362-A2C2-4B1A-905B-F00791F9038A}"
@@ -36,10 +34,6 @@
 		{118E0D32-5553-4F73-9927-E873C1C500E4}.Debug|Win32.Build.0 = Debug|Win32
 		{118E0D32-5553-4F73-9927-E873C1C500E4}.Release|Win32.ActiveCfg = Release|Win32
 		{118E0D32-5553-4F73-9927-E873C1C500E4}.Release|Win32.Build.0 = Release|Win32
-		{47CB840D-85C8-460F-9101-BEB54BEF9D56}.Debug|Win32.ActiveCfg = Debug|Win32
-		{47CB840D-85C8-460F-9101-BEB54BEF9D56}.Debug|Win32.Build.0 = Debug|Win32
-		{47CB840D-85C8-460F-9101-BEB54BEF9D56}.Release|Win32.ActiveCfg = Release|Win32
-		{47CB840D-85C8-460F-9101-BEB54BEF9D56}.Release|Win32.Build.0 = Release|Win32
 		{311F2B21-AEC4-4384-8209-BB83B54749B4}.Debug|Win32.ActiveCfg = Debug|Win32
 		{311F2B21-AEC4-4384-8209-BB83B54749B4}.Debug|Win32.Build.0 = Debug|Win32
 		{311F2B21-AEC4-4384-8209-BB83B54749B4}.Release|Win32.ActiveCfg = Release|Win32

Modified: branches/ssh_auth_dialog/teraterm/ttermpro.v11.sln
===================================================================
--- branches/ssh_auth_dialog/teraterm/ttermpro.v11.sln	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/teraterm/ttermpro.v11.sln	2019-04-24 14:08:16 UTC (rev 7613)
@@ -6,8 +6,6 @@
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ttpcmn", "ttpcmn\ttpcmn.v11.vcxproj", "{118E0D32-5553-4F73-9927-E873C1C500E4}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ttpdlg", "ttpdlg\ttpdlg.v11.vcxproj", "{47CB840D-85C8-460F-9101-BEB54BEF9D56}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ttpfile", "ttpfile\ttpfile.v11.vcxproj", "{311F2B21-AEC4-4384-8209-BB83B54749B4}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ttpmacro", "ttpmacro\ttpmacro.v11.vcxproj", "{BA519362-A2C2-4B1A-905B-F00791F9038A}"
@@ -36,10 +34,6 @@
 		{118E0D32-5553-4F73-9927-E873C1C500E4}.Debug|Win32.Build.0 = Debug|Win32
 		{118E0D32-5553-4F73-9927-E873C1C500E4}.Release|Win32.ActiveCfg = Release|Win32
 		{118E0D32-5553-4F73-9927-E873C1C500E4}.Release|Win32.Build.0 = Release|Win32
-		{47CB840D-85C8-460F-9101-BEB54BEF9D56}.Debug|Win32.ActiveCfg = Debug|Win32
-		{47CB840D-85C8-460F-9101-BEB54BEF9D56}.Debug|Win32.Build.0 = Debug|Win32
-		{47CB840D-85C8-460F-9101-BEB54BEF9D56}.Release|Win32.ActiveCfg = Release|Win32
-		{47CB840D-85C8-460F-9101-BEB54BEF9D56}.Release|Win32.Build.0 = Release|Win32
 		{311F2B21-AEC4-4384-8209-BB83B54749B4}.Debug|Win32.ActiveCfg = Debug|Win32
 		{311F2B21-AEC4-4384-8209-BB83B54749B4}.Debug|Win32.Build.0 = Debug|Win32
 		{311F2B21-AEC4-4384-8209-BB83B54749B4}.Release|Win32.ActiveCfg = Release|Win32

Modified: branches/ssh_auth_dialog/teraterm/ttermpro.v12.sln
===================================================================
--- branches/ssh_auth_dialog/teraterm/ttermpro.v12.sln	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/teraterm/ttermpro.v12.sln	2019-04-24 14:08:16 UTC (rev 7613)
@@ -8,8 +8,6 @@
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ttpcmn", "ttpcmn\ttpcmn.v12.vcxproj", "{118E0D32-5553-4F73-9927-E873C1C500E4}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ttpdlg", "ttpdlg\ttpdlg.v12.vcxproj", "{47CB840D-85C8-460F-9101-BEB54BEF9D56}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ttpfile", "ttpfile\ttpfile.v12.vcxproj", "{311F2B21-AEC4-4384-8209-BB83B54749B4}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ttpmacro", "ttpmacro\ttpmacro.v12.vcxproj", "{BA519362-A2C2-4B1A-905B-F00791F9038A}"
@@ -38,10 +36,6 @@
 		{118E0D32-5553-4F73-9927-E873C1C500E4}.Debug|Win32.Build.0 = Debug|Win32
 		{118E0D32-5553-4F73-9927-E873C1C500E4}.Release|Win32.ActiveCfg = Release|Win32
 		{118E0D32-5553-4F73-9927-E873C1C500E4}.Release|Win32.Build.0 = Release|Win32
-		{47CB840D-85C8-460F-9101-BEB54BEF9D56}.Debug|Win32.ActiveCfg = Debug|Win32
-		{47CB840D-85C8-460F-9101-BEB54BEF9D56}.Debug|Win32.Build.0 = Debug|Win32
-		{47CB840D-85C8-460F-9101-BEB54BEF9D56}.Release|Win32.ActiveCfg = Release|Win32
-		{47CB840D-85C8-460F-9101-BEB54BEF9D56}.Release|Win32.Build.0 = Release|Win32
 		{311F2B21-AEC4-4384-8209-BB83B54749B4}.Debug|Win32.ActiveCfg = Debug|Win32
 		{311F2B21-AEC4-4384-8209-BB83B54749B4}.Debug|Win32.Build.0 = Debug|Win32
 		{311F2B21-AEC4-4384-8209-BB83B54749B4}.Release|Win32.ActiveCfg = Release|Win32

Modified: branches/ssh_auth_dialog/teraterm/ttermpro.v14.sln
===================================================================
--- branches/ssh_auth_dialog/teraterm/ttermpro.v14.sln	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/teraterm/ttermpro.v14.sln	2019-04-24 14:08:16 UTC (rev 7613)
@@ -8,8 +8,6 @@
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ttpcmn", "ttpcmn\ttpcmn.v14.vcxproj", "{118E0D32-5553-4F73-9927-E873C1C500E4}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ttpdlg", "ttpdlg\ttpdlg.v14.vcxproj", "{47CB840D-85C8-460F-9101-BEB54BEF9D56}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ttpfile", "ttpfile\ttpfile.v14.vcxproj", "{311F2B21-AEC4-4384-8209-BB83B54749B4}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ttpmacro", "ttpmacro\ttpmacro.v14.vcxproj", "{BA519362-A2C2-4B1A-905B-F00791F9038A}"
@@ -38,10 +36,6 @@
 		{118E0D32-5553-4F73-9927-E873C1C500E4}.Debug|Win32.Build.0 = Debug|Win32
 		{118E0D32-5553-4F73-9927-E873C1C500E4}.Release|Win32.ActiveCfg = Release|Win32
 		{118E0D32-5553-4F73-9927-E873C1C500E4}.Release|Win32.Build.0 = Release|Win32
-		{47CB840D-85C8-460F-9101-BEB54BEF9D56}.Debug|Win32.ActiveCfg = Debug|Win32
-		{47CB840D-85C8-460F-9101-BEB54BEF9D56}.Debug|Win32.Build.0 = Debug|Win32
-		{47CB840D-85C8-460F-9101-BEB54BEF9D56}.Release|Win32.ActiveCfg = Release|Win32
-		{47CB840D-85C8-460F-9101-BEB54BEF9D56}.Release|Win32.Build.0 = Release|Win32
 		{311F2B21-AEC4-4384-8209-BB83B54749B4}.Debug|Win32.ActiveCfg = Debug|Win32
 		{311F2B21-AEC4-4384-8209-BB83B54749B4}.Debug|Win32.Build.0 = Debug|Win32
 		{311F2B21-AEC4-4384-8209-BB83B54749B4}.Release|Win32.ActiveCfg = Release|Win32

Modified: branches/ssh_auth_dialog/teraterm/ttermpro.v15.sln
===================================================================
--- branches/ssh_auth_dialog/teraterm/ttermpro.v15.sln	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/teraterm/ttermpro.v15.sln	2019-04-24 14:08:16 UTC (rev 7613)
@@ -8,8 +8,6 @@
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ttpcmn", "ttpcmn\ttpcmn.v15.vcxproj", "{118E0D32-5553-4F73-9927-E873C1C500E4}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ttpdlg", "ttpdlg\ttpdlg.v15.vcxproj", "{47CB840D-85C8-460F-9101-BEB54BEF9D56}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ttpfile", "ttpfile\ttpfile.v15.vcxproj", "{311F2B21-AEC4-4384-8209-BB83B54749B4}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ttpmacro", "ttpmacro\ttpmacro.v15.vcxproj", "{BA519362-A2C2-4B1A-905B-F00791F9038A}"
@@ -38,10 +36,6 @@
 		{118E0D32-5553-4F73-9927-E873C1C500E4}.Debug|Win32.Build.0 = Debug|Win32
 		{118E0D32-5553-4F73-9927-E873C1C500E4}.Release|Win32.ActiveCfg = Release|Win32
 		{118E0D32-5553-4F73-9927-E873C1C500E4}.Release|Win32.Build.0 = Release|Win32
-		{47CB840D-85C8-460F-9101-BEB54BEF9D56}.Debug|Win32.ActiveCfg = Debug|Win32
-		{47CB840D-85C8-460F-9101-BEB54BEF9D56}.Debug|Win32.Build.0 = Debug|Win32
-		{47CB840D-85C8-460F-9101-BEB54BEF9D56}.Release|Win32.ActiveCfg = Release|Win32
-		{47CB840D-85C8-460F-9101-BEB54BEF9D56}.Release|Win32.Build.0 = Release|Win32
 		{311F2B21-AEC4-4384-8209-BB83B54749B4}.Debug|Win32.ActiveCfg = Debug|Win32
 		{311F2B21-AEC4-4384-8209-BB83B54749B4}.Debug|Win32.Build.0 = Debug|Win32
 		{311F2B21-AEC4-4384-8209-BB83B54749B4}.Release|Win32.ActiveCfg = Release|Win32

Copied: branches/ssh_auth_dialog/teraterm/ttermpro.v16.sln (from rev 7520, branches/ssh_auth_dialog/teraterm/ttermpro.v11.sln)
===================================================================
--- branches/ssh_auth_dialog/teraterm/ttermpro.v16.sln	                        (rev 0)
+++ branches/ssh_auth_dialog/teraterm/ttermpro.v16.sln	2019-04-24 14:08:16 UTC (rev 7613)
@@ -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/ssh_auth_dialog/teraterm/ttermpro.v9.sln
===================================================================
--- branches/ssh_auth_dialog/teraterm/ttermpro.v9.sln	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/teraterm/ttermpro.v9.sln	2019-04-24 14:08:16 UTC (rev 7613)
@@ -2,7 +2,6 @@
 # Visual Studio 2008
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ttermpro", "teraterm\ttermpro.v9.vcproj", "{BC4CDBE3-6269-47A8-BD74-EEB3A6160E06}"
 	ProjectSection(ProjectDependencies) = postProject
-		{47CB840D-85C8-460F-9101-BEB54BEF9D56} = {47CB840D-85C8-460F-9101-BEB54BEF9D56}
 		{BA519362-A2C2-4B1A-905B-F00791F9038A} = {BA519362-A2C2-4B1A-905B-F00791F9038A}
 		{5CF58947-E861-4A5C-B0B1-E85486F149CD} = {5CF58947-E861-4A5C-B0B1-E85486F149CD}
 		{6D08053B-1C68-4A7E-8766-3553F5AF010B} = {6D08053B-1C68-4A7E-8766-3553F5AF010B}
@@ -14,12 +13,6 @@
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ttpcmn", "ttpcmn\ttpcmn.v9.vcproj", "{118E0D32-5553-4F73-9927-E873C1C500E4}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ttpdlg", "ttpdlg\ttpdlg.v9.vcproj", "{47CB840D-85C8-460F-9101-BEB54BEF9D56}"
-	ProjectSection(ProjectDependencies) = postProject
-		{80F1C3F0-A213-4D48-85C8-A265990D19A7} = {80F1C3F0-A213-4D48-85C8-A265990D19A7}
-		{118E0D32-5553-4F73-9927-E873C1C500E4} = {118E0D32-5553-4F73-9927-E873C1C500E4}
-	EndProjectSection
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ttpfile", "ttpfile\ttpfile.v9.vcproj", "{311F2B21-AEC4-4384-8209-BB83B54749B4}"
 	ProjectSection(ProjectDependencies) = postProject
 		{118E0D32-5553-4F73-9927-E873C1C500E4} = {118E0D32-5553-4F73-9927-E873C1C500E4}
@@ -60,10 +53,6 @@
 		{118E0D32-5553-4F73-9927-E873C1C500E4}.Debug|Win32.Build.0 = Debug|Win32
 		{118E0D32-5553-4F73-9927-E873C1C500E4}.Release|Win32.ActiveCfg = Release|Win32
 		{118E0D32-5553-4F73-9927-E873C1C500E4}.Release|Win32.Build.0 = Release|Win32
-		{47CB840D-85C8-460F-9101-BEB54BEF9D56}.Debug|Win32.ActiveCfg = Debug|Win32
-		{47CB840D-85C8-460F-9101-BEB54BEF9D56}.Debug|Win32.Build.0 = Debug|Win32
-		{47CB840D-85C8-460F-9101-BEB54BEF9D56}.Release|Win32.ActiveCfg = Release|Win32
-		{47CB840D-85C8-460F-9101-BEB54BEF9D56}.Release|Win32.Build.0 = Release|Win32
 		{311F2B21-AEC4-4384-8209-BB83B54749B4}.Debug|Win32.ActiveCfg = Debug|Win32
 		{311F2B21-AEC4-4384-8209-BB83B54749B4}.Debug|Win32.Build.0 = Debug|Win32
 		{311F2B21-AEC4-4384-8209-BB83B54749B4}.Release|Win32.ActiveCfg = Release|Win32

Modified: branches/ssh_auth_dialog/teraterm/ttpcmn/CMakeLists.txt
===================================================================
--- branches/ssh_auth_dialog/teraterm/ttpcmn/CMakeLists.txt	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/teraterm/ttpcmn/CMakeLists.txt	2019-04-24 14:08:16 UTC (rev 7613)
@@ -30,13 +30,10 @@
   )
 
 set(SRC
-  ttpcmn.def
-  cmn_res.h
   language.c
   language.h
   ttcmn.c
   ttpcmn-version.rc
-  ttpcmn.rc
   ${COMMON_SRC}
   )
 

Deleted: branches/ssh_auth_dialog/teraterm/ttpcmn/cmn_res.h
===================================================================
--- branches/ssh_auth_dialog/teraterm/ttpcmn/cmn_res.h	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/teraterm/ttpcmn/cmn_res.h	2019-04-24 14:08:16 UTC (rev 7613)
@@ -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/ssh_auth_dialog/teraterm/ttpcmn/language.c
===================================================================
--- branches/ssh_auth_dialog/teraterm/ttpcmn/language.c	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/teraterm/ttpcmn/language.c	2019-04-24 14:08:16 UTC (rev 7613)
@@ -29,16 +29,17 @@
 
 // TTCMN.DLL character code conversion
 
+#include <mbstring.h>
+#include <locale.h>
 #include "teraterm.h"
 #include "tttypes.h"
-#include <mbstring.h>
-#include <locale.h>
 #include "codemap.h"
 
+#define DllExport __declspec(dllexport)
 #include "language.h"
 
 // export\x82\xB3\x82\xEA\x82Ă\xA2\x82\xE9
-unsigned short ConvertUnicode(unsigned short code, const codemap_t *table, int tmax)
+DllExport unsigned short ConvertUnicode(unsigned short code, const codemap_t *table, int tmax)
 {
 	int low, mid, high;
 	unsigned short result;
@@ -65,7 +66,7 @@
 }
 
 // Japanese SJIS -> JIS
-WORD PASCAL SJIS2JIS(WORD KCode)
+DllExport WORD PASCAL SJIS2JIS(WORD KCode)
 {
 	WORD x0,x1,x2,y0;
 	BYTE b = LOBYTE(KCode);
@@ -92,13 +93,13 @@
 }
 
 // Japanese SJIS -> EUC
-WORD PASCAL SJIS2EUC(WORD KCode)
+DllExport WORD PASCAL SJIS2EUC(WORD KCode)
 {
 	return (SJIS2JIS(KCode) | 0x8080);
 }
 
 // Japanese JIS -> SJIS
-WORD PASCAL JIS2SJIS(WORD KCode)
+DllExport WORD PASCAL JIS2SJIS(WORD KCode)
 {
 	WORD n1, n2, SJIS;
 
@@ -532,7 +533,7 @@
 };
 
 // Russian character set conversion
-BYTE PASCAL RussConv(int cin, int cout, BYTE b)
+DllExport BYTE PASCAL RussConv(int cin, int cout, BYTE b)
 // cin: input character set (IdWindows/IdKOI8/Id866/IdISO)
 // cin: output character set (IdWindows/IdKOI8/Id866/IdISO)
 {
@@ -543,7 +544,7 @@
 }
 
 // Russian character set conversion for a character string
-void PASCAL RussConvStr(int cin, int cout, PCHAR Str, int count)
+DllExport void PASCAL RussConvStr(int cin, int cout, PCHAR Str, int count)
 // cin: input character set (IdWindows/IdKOI8/Id866/IdISO)
 // cin: output character set (IdWindows/IdKOI8/Id866/IdISO)
 {

Modified: branches/ssh_auth_dialog/teraterm/ttpcmn/language.h
===================================================================
--- branches/ssh_auth_dialog/teraterm/ttpcmn/language.h	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/teraterm/ttpcmn/language.h	2019-04-24 14:08:16 UTC (rev 7613)
@@ -29,17 +29,22 @@
 
 /* TTCMN.DLL, character code conversion */
 
-#include "codemap.h"
+#pragma once
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
+#if !defined(DllExport)
+#define DllExport __declspec(dllimport)
+#endif
+
 /* proto types */
-WORD PASCAL SJIS2JIS(WORD KCode);
-WORD PASCAL SJIS2EUC(WORD KCode);
-WORD PASCAL JIS2SJIS(WORD KCode);
-BYTE PASCAL RussConv(int cin, int cout, BYTE b);
-void PASCAL RussConvStr(int cin, int cout, PCHAR Str, int count);
+DllExport WORD PASCAL SJIS2JIS(WORD KCode);
+DllExport WORD PASCAL SJIS2EUC(WORD KCode);
+DllExport WORD PASCAL JIS2SJIS(WORD KCode);
+DllExport BYTE PASCAL RussConv(int cin, int cout, BYTE b);
+DllExport void PASCAL RussConvStr(int cin, int cout, PCHAR Str, int count);
 
 #ifdef __cplusplus
 }

Modified: branches/ssh_auth_dialog/teraterm/ttpcmn/ttcmn.c
===================================================================
--- branches/ssh_auth_dialog/teraterm/ttpcmn/ttcmn.c	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/teraterm/ttpcmn/ttcmn.c	2019-04-24 14:08:16 UTC (rev 7613)
@@ -32,13 +32,8 @@
 #endif
 
 /* TTCMN.DLL, main */
-#include "teraterm.h"
-#include "tttypes.h"
 #include <direct.h>
 #include <string.h>
-#include "ttftypes.h"
-#include "ttlib.h"
-#include "language.h"
 #include <stdio.h>
 #include <windows.h>
 #include <tchar.h>
@@ -46,11 +41,22 @@
 #include <locale.h>
 #include <htmlhelp.h>
 
+#define DllExport __declspec(dllexport)
+#include "language.h"
+#undef DllExport
+
+#include "teraterm.h"
+#include "tttypes.h"
+#include "ttftypes.h"
+#include "ttlib.h"
 #include "compat_w95.h"
 #include "tt_res.h"
-#include "ttcommon.h"
 #include "codeconv.h"
 
+#define DllExport __declspec(dllexport)
+#include "ttcommon.h"
+
+
 // TMap \x82\xF0\x8Ai\x94[\x82\xB7\x82\xE9\x83t\x83@\x83C\x83\x8B\x83}\x83b\x83s\x83\x93\x83O\x83I\x83u\x83W\x83F\x83N\x83g(\x8B\xA4\x97L\x83\x81\x83\x82\x83\x8A)\x82̖\xBC\x91O
 // TMap(\x82Ƃ\xBB\x82̃\x81\x83\x93\x83o)\x82̍X\x90V\x8E\x9E\x82͋\x8C\x83o\x81[\x83W\x83\x87\x83\x93\x82Ƃ̓\xAF\x8E\x9E\x8BN\x93\xAE\x82ׂ̈ɕς\xA6\x82\xE9\x95K\x97v\x82\xAA\x82\xA0\x82邪
 // \x98A\x94Ԃ\xA9\x82\xE7\x83o\x81[\x83W\x83\x87\x83\x93\x94ԍ\x86\x82\xF0\x8Eg\x82\xA4\x82悤\x82ɕύX\x82\xB5\x82\xBD\x88ׁA\x92ʏ\xED\x82͎蓮\x82ŕύX\x82\xB7\x82\xE9\x95K\x97v\x82͖\xB3\x82\xA2

Modified: branches/ssh_auth_dialog/teraterm/ttpcmn/ttpcmn-version.rc
===================================================================
--- branches/ssh_auth_dialog/teraterm/ttpcmn/ttpcmn-version.rc	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/teraterm/ttpcmn/ttpcmn-version.rc	2019-04-24 14:08:16 UTC (rev 7613)
@@ -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/ssh_auth_dialog/teraterm/ttpcmn/ttpcmn.def
===================================================================
--- branches/ssh_auth_dialog/teraterm/ttpcmn/ttpcmn.def	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/teraterm/ttpcmn/ttpcmn.def	2019-04-24 14:08:16 UTC (rev 7613)
@@ -94,3 +94,4 @@
 
   SetI18DlgStrs
   SetI18MenuStrs
+  GetMessageboxFont

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

Deleted: branches/ssh_auth_dialog/teraterm/ttpcmn/ttpcmn.rc
===================================================================
--- branches/ssh_auth_dialog/teraterm/ttpcmn/ttpcmn.rc	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/teraterm/ttpcmn/ttpcmn.rc	2019-04-24 14:08:16 UTC (rev 7613)
@@ -1,65 +0,0 @@
-// Microsoft Visual C++ generated resource script.
-//
-#include "cmn_res.h"
-
-#define APSTUDIO_READONLY_SYMBOLS
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 2 resource.
-//
-#include "afxres.h"
-
-/////////////////////////////////////////////////////////////////////////////
-#undef APSTUDIO_READONLY_SYMBOLS
-
-/////////////////////////////////////////////////////////////////////////////
-// \x93\xFA\x96{\x8C\xEA resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_JPN)
-#ifdef _WIN32
-LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT
-#pragma code_page(932)
-#endif //_WIN32
-
-#ifdef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// TEXTINCLUDE
-//
-
-1 TEXTINCLUDE 
-BEGIN
-    "cmn_res.h\0"
-END
-
-2 TEXTINCLUDE 
-BEGIN
-    "#include ""afxres.h""\r\n"
-    "\0"
-END
-
-3 TEXTINCLUDE 
-BEGIN
-    "#include ""ttpcmn-version.rc""\r\n"
-    "\0"
-END
-
-#endif    // APSTUDIO_INVOKED
-
-
-
-#endif    // \x93\xFA\x96{\x8C\xEA resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-
-#ifndef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 3 resource.
-//
-#include "ttpcmn-version.rc"
-
-/////////////////////////////////////////////////////////////////////////////
-#endif    // not APSTUDIO_INVOKED
-

Modified: branches/ssh_auth_dialog/teraterm/ttpcmn/ttpcmn.v10.vcxproj
===================================================================
--- branches/ssh_auth_dialog/teraterm/ttpcmn/ttpcmn.v10.vcxproj	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/teraterm/ttpcmn/ttpcmn.v10.vcxproj	2019-04-24 14:08:16 UTC (rev 7613)
@@ -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/ssh_auth_dialog/teraterm/ttpcmn/ttpcmn.v10.vcxproj.filters
===================================================================
--- branches/ssh_auth_dialog/teraterm/ttpcmn/ttpcmn.v10.vcxproj.filters	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/teraterm/ttpcmn/ttpcmn.v10.vcxproj.filters	2019-04-24 14:08:16 UTC (rev 7613)
@@ -36,9 +36,6 @@
     </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 +58,5 @@
     <ResourceCompile Include="ttpcmn-version.rc">
       <Filter>Resource Files</Filter>
     </ResourceCompile>
-    <ResourceCompile Include="ttpcmn.rc">
-      <Filter>Resource Files</Filter>
-    </ResourceCompile>
   </ItemGroup>
 </Project>

Modified: branches/ssh_auth_dialog/teraterm/ttpcmn/ttpcmn.v11.vcxproj
===================================================================
--- branches/ssh_auth_dialog/teraterm/ttpcmn/ttpcmn.v11.vcxproj	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/teraterm/ttpcmn/ttpcmn.v11.vcxproj	2019-04-24 14:08:16 UTC (rev 7613)
@@ -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/ssh_auth_dialog/teraterm/ttpcmn/ttpcmn.v11.vcxproj.filters
===================================================================
--- branches/ssh_auth_dialog/teraterm/ttpcmn/ttpcmn.v11.vcxproj.filters	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/teraterm/ttpcmn/ttpcmn.v11.vcxproj.filters	2019-04-24 14:08:16 UTC (rev 7613)
@@ -36,9 +36,6 @@
     </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 +58,5 @@
     <ResourceCompile Include="ttpcmn-version.rc">
       <Filter>Resource Files</Filter>
     </ResourceCompile>
-    <ResourceCompile Include="ttpcmn.rc">
-      <Filter>Resource Files</Filter>
-    </ResourceCompile>
   </ItemGroup>
 </Project>

Modified: branches/ssh_auth_dialog/teraterm/ttpcmn/ttpcmn.v12.vcxproj
===================================================================
--- branches/ssh_auth_dialog/teraterm/ttpcmn/ttpcmn.v12.vcxproj	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/teraterm/ttpcmn/ttpcmn.v12.vcxproj	2019-04-24 14:08:16 UTC (rev 7613)
@@ -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/ssh_auth_dialog/teraterm/ttpcmn/ttpcmn.v12.vcxproj.filters
===================================================================
--- branches/ssh_auth_dialog/teraterm/ttpcmn/ttpcmn.v12.vcxproj.filters	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/teraterm/ttpcmn/ttpcmn.v12.vcxproj.filters	2019-04-24 14:08:16 UTC (rev 7613)
@@ -36,9 +36,6 @@
     </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 +58,5 @@
     <ResourceCompile Include="ttpcmn-version.rc">
       <Filter>Resource Files</Filter>
     </ResourceCompile>
-    <ResourceCompile Include="ttpcmn.rc">
-      <Filter>Resource Files</Filter>
-    </ResourceCompile>
   </ItemGroup>
 </Project>

Modified: branches/ssh_auth_dialog/teraterm/ttpcmn/ttpcmn.v14.vcxproj
===================================================================
--- branches/ssh_auth_dialog/teraterm/ttpcmn/ttpcmn.v14.vcxproj	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/teraterm/ttpcmn/ttpcmn.v14.vcxproj	2019-04-24 14:08:16 UTC (rev 7613)
@@ -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/ssh_auth_dialog/teraterm/ttpcmn/ttpcmn.v14.vcxproj.filters
===================================================================
--- branches/ssh_auth_dialog/teraterm/ttpcmn/ttpcmn.v14.vcxproj.filters	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/teraterm/ttpcmn/ttpcmn.v14.vcxproj.filters	2019-04-24 14:08:16 UTC (rev 7613)
@@ -36,9 +36,6 @@
     </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 +58,5 @@
     <ResourceCompile Include="ttpcmn-version.rc">
       <Filter>Resource Files</Filter>
     </ResourceCompile>
-    <ResourceCompile Include="ttpcmn.rc">
-      <Filter>Resource Files</Filter>
-    </ResourceCompile>
   </ItemGroup>
 </Project>

Modified: branches/ssh_auth_dialog/teraterm/ttpcmn/ttpcmn.v15.vcxproj
===================================================================
--- branches/ssh_auth_dialog/teraterm/ttpcmn/ttpcmn.v15.vcxproj	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/teraterm/ttpcmn/ttpcmn.v15.vcxproj	2019-04-24 14:08:16 UTC (rev 7613)
@@ -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" />
@@ -152,7 +149,6 @@
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="ttpcmn-version.rc" />
-    <ResourceCompile Include="ttpcmn.rc" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">

Modified: branches/ssh_auth_dialog/teraterm/ttpcmn/ttpcmn.v15.vcxproj.filters
===================================================================
--- branches/ssh_auth_dialog/teraterm/ttpcmn/ttpcmn.v15.vcxproj.filters	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/teraterm/ttpcmn/ttpcmn.v15.vcxproj.filters	2019-04-24 14:08:16 UTC (rev 7613)
@@ -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>
@@ -64,8 +61,5 @@
     <ResourceCompile Include="ttpcmn-version.rc">
       <Filter>Resource Files</Filter>
     </ResourceCompile>
-    <ResourceCompile Include="ttpcmn.rc">
-      <Filter>Resource Files</Filter>
-    </ResourceCompile>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>

Copied: branches/ssh_auth_dialog/teraterm/ttpcmn/ttpcmn.v16.vcxproj (from rev 7520, branches/ssh_auth_dialog/teraterm/ttpcmn/ttpcmn.v14.vcxproj)
===================================================================
--- branches/ssh_auth_dialog/teraterm/ttpcmn/ttpcmn.v16.vcxproj	                        (rev 0)
+++ branches/ssh_auth_dialog/teraterm/ttpcmn/ttpcmn.v16.vcxproj	2019-04-24 14:08:16 UTC (rev 7613)
@@ -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/ssh_auth_dialog/teraterm/ttpcmn/ttpcmn.v16.vcxproj.filters (from rev 7520, branches/ssh_auth_dialog/teraterm/ttpcmn/ttpcmn.v14.vcxproj.filters)
===================================================================
--- branches/ssh_auth_dialog/teraterm/ttpcmn/ttpcmn.v16.vcxproj.filters	                        (rev 0)
+++ branches/ssh_auth_dialog/teraterm/ttpcmn/ttpcmn.v16.vcxproj.filters	2019-04-24 14:08:16 UTC (rev 7613)
@@ -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/ssh_auth_dialog/teraterm/ttpcmn/ttpcmn.v9.vcproj
===================================================================
--- branches/ssh_auth_dialog/teraterm/ttpcmn/ttpcmn.v9.vcproj	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/teraterm/ttpcmn/ttpcmn.v9.vcproj	2019-04-24 14:08:16 UTC (rev 7613)
@@ -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/ssh_auth_dialog/teraterm/ttpcmn/ttpcmn.vcproj
===================================================================
--- branches/ssh_auth_dialog/teraterm/ttpcmn/ttpcmn.vcproj	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/teraterm/ttpcmn/ttpcmn.vcproj	2019-04-24 14:08:16 UTC (rev 7613)
@@ -71,11 +71,10 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="setupapi.lib"
+				AdditionalDependencies="User32.lib gdi32.lib SHELL32.lib ADVAPI32.lib ole32.lib setupapi.lib"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=""
-				IgnoreDefaultLibraryNames="nafxcw.lib"
 				ModuleDefinitionFile="$(ProjectName).def"
 				DelayLoadDLLs="setupapi.dll;user32.dll"
 				GenerateDebugInformation="true"
@@ -163,11 +162,10 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="setupapi.lib"
+				AdditionalDependencies="User32.lib gdi32.lib SHELL32.lib ADVAPI32.lib ole32.lib setupapi.lib"
 				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>
@@ -275,10 +269,6 @@
 				RelativePath="ttpcmn-version.rc"
 				>
 			</File>
-			<File
-				RelativePath="ttpcmn.rc"
-				>
-			</File>
 		</Filter>
 	</Files>
 	<Globals>

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

Deleted: branches/ssh_auth_dialog/teraterm/ttpdlg/svnversion.h.in
===================================================================
--- branches/ssh_auth_dialog/teraterm/ttpdlg/svnversion.h.in	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/teraterm/ttpdlg/svnversion.h.in	2019-04-24 14:08:16 UTC (rev 7613)
@@ -1 +0,0 @@
-#cmakedefine SVNVERSION @SVNVERSION@

Modified: branches/ssh_auth_dialog/teraterm/ttpdlg/ttdlg.c
===================================================================
--- branches/ssh_auth_dialog/teraterm/ttpdlg/ttdlg.c	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/teraterm/ttpdlg/ttdlg.c	2019-04-24 14:08:16 UTC (rev 7613)
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 1994-1998 T. Teranishi
- * (C) 2004-2018 TeraTerm Project
+ * (C) 2004-2019 TeraTerm Project
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -29,6 +29,7 @@
 /* IPv6 modification is Copyright(C) 2000 Jun-ya Kato <kato****@win6*****> */
 
 /* TTDLG.DLL, dialog boxes */
+#include "teraterm_conf.h"
 #include "teraterm.h"
 #include <stdio.h>
 #include <string.h>
@@ -45,6 +46,7 @@
 #include "ttcommon.h"
 #include "dlg_res.h"
 #include "svnversion.h"
+#include "ttdlg.h"
 
 // Oniguruma: Regular expression library
 #define ONIG_EXTERN extern
@@ -55,7 +57,7 @@
 #undef EFFECT_ENABLED	// \x83G\x83t\x83F\x83N\x83g\x82̗L\x8C\xF8\x89\xDB
 #undef TEXTURE_ENABLED	// \x83e\x83N\x83X\x83`\x83\x83\x82̗L\x8C\xF8\x89\xDB
 
-#include "compat_w95.h"
+//#include "compat_w95.h"
 
 #ifdef _DEBUG
 #define calloc(c, s)  _calloc_dbg((c), (s), _NORMAL_BLOCK, __FILE__, __LINE__)
@@ -63,18 +65,18 @@
 #define _strdup(s)	  _strdup_dbg((s), _NORMAL_BLOCK, __FILE__, __LINE__)
 #endif
 
-static HANDLE hInst;
+#undef DialogBoxParam
+#define DialogBoxParam(p1,p2,p3,p4,p5) \
+	TTDialogBoxParam(p1,p2,p3,p4,p5)
+#undef DialogBox
+#define DialogBox(p1,p2,p3,p4) \
+	TTDialogBox(p1,p2,p3,p4)
+#undef EndDialog
+#define EndDialog(p1,p2) \
+	TTEndDialog(p1, p2)
 
-static HFONT DlgAboutFont;
-static HFONT DlgDirFont;
-static HFONT DlgGenFont;
-static HFONT DlgHostFont;
-static HFONT DlgKeybFont;
-static HFONT DlgSerialFont;
-static HFONT DlgTcpipFont;
-static HFONT DlgTermFont;
-static HFONT DlgWinFont;
-static HFONT DlgWinlistFont;
+//static HANDLE hInst;
+extern HANDLE hInst;
 
 char UILanguageFile[MAX_PATH];
 
@@ -116,169 +118,63 @@
 	 "230400", "460800", "921600", NULL};
 
 
-BOOL CALLBACK TermDlg(HWND Dialog, UINT Message, WPARAM wParam, LPARAM lParam)
+static INT_PTR CALLBACK TermDlg(HWND Dialog, UINT Message, WPARAM wParam, LPARAM lParam)
 {
+	static const DlgTextInfo TextInfosCom[] = {
+		{ 0, "DLG_TERM_TITLE" },
+		{ IDC_TERMWIDTHLABEL, "DLG_TERM_WIDTHLABEL" },
+		{ IDC_TERMISWIN, "DLG_TERM_ISWIN" },
+		{ IDC_TERMRESIZE, "DLG_TERM_RESIZE" },
+		{ IDC_TERMNEWLINE, "DLG_TERM_NEWLINE" },
+		{ IDC_TERMCRRCVLABEL, "DLG_TERM_CRRCV" },
+		{ IDC_TERMCRSENDLABEL, "DLG_TERM_CRSEND" },
+		{ IDC_TERMIDLABEL, "DLG_TERM_ID" },
+		{ IDC_TERMLOCALECHO, "DLG_TERM_LOCALECHO" },
+		{ IDC_TERMANSBACKTEXT, "DLG_TERM_ANSBACK" },
+		{ IDC_TERMAUTOSWITCH, "DLG_TERM_AUTOSWITCH" },
+		{ IDOK, "BTN_OK" },
+		{ IDCANCEL, "BTN_CANCEL" },
+		{ IDC_TERMHELP, "BTN_HELP" },
+	};
 	PTTSet ts;
 	WORD w;
 	//  char Temp[HostNameMaxLength + 1]; // 81(yutaka)
 	char Temp[81]; // 81(yutaka)
-	char uimsg[MAX_UIMSG], uimsg2[MAX_UIMSG];
-	LOGFONT logfont;
-	HFONT font;
 
 	switch (Message) {
 		case WM_INITDIALOG:
 			ts = (PTTSet)lParam;
-			SetWindowLong(Dialog, DWL_USER, lParam);
+			SetWindowLongPtr(Dialog, DWLP_USER, lParam);
 
-			font = (HFONT)SendMessage(Dialog, WM_GETFONT, 0, 0);
-			GetObject(font, sizeof(LOGFONT), &logfont);
-			if (get_lang_font("DLG_SYSTEM_FONT", Dialog, &logfont, &DlgTermFont, UILanguageFile)) {
-				SendDlgItemMessage(Dialog, IDC_TERMWIDTHLABEL, WM_SETFONT, (WPARAM)DlgTermFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_TERMWIDTH, WM_SETFONT, (WPARAM)DlgTermFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_TERMX, WM_SETFONT, (WPARAM)DlgTermFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_TERMHEIGHT, WM_SETFONT, (WPARAM)DlgTermFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_TERMISWIN, WM_SETFONT, (WPARAM)DlgTermFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_TERMRESIZE, WM_SETFONT, (WPARAM)DlgTermFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_TERMNEWLINE, WM_SETFONT, (WPARAM)DlgTermFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_TERMCRRCVLABEL, WM_SETFONT, (WPARAM)DlgTermFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_TERMCRRCV, WM_SETFONT, (WPARAM)DlgTermFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_TERMCRSENDLABEL, WM_SETFONT, (WPARAM)DlgTermFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_TERMCRSEND, WM_SETFONT, (WPARAM)DlgTermFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_TERMIDLABEL, WM_SETFONT, (WPARAM)DlgTermFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_TERMID, WM_SETFONT, (WPARAM)DlgTermFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_TERMLOCALECHO, WM_SETFONT, (WPARAM)DlgTermFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_TERMANSBACKTEXT, WM_SETFONT, (WPARAM)DlgTermFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_TERMANSBACK, WM_SETFONT, (WPARAM)DlgTermFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_TERMAUTOSWITCH, WM_SETFONT, (WPARAM)DlgTermFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDOK, WM_SETFONT, (WPARAM)DlgTermFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDCANCEL, WM_SETFONT, (WPARAM)DlgTermFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_TERMHELP, WM_SETFONT, (WPARAM)DlgTermFont, MAKELPARAM(TRUE,0));
+			SetDlgTexts(Dialog, TextInfosCom, _countof(TextInfosCom), UILanguageFile);
 				if (ts->Language==IdJapanese) {
-					SendDlgItemMessage(Dialog, IDC_TERMKANJILABEL, WM_SETFONT, (WPARAM)DlgTermFont, MAKELPARAM(TRUE,0));
-					SendDlgItemMessage(Dialog, IDC_TERMKANJI, WM_SETFONT, (WPARAM)DlgTermFont, MAKELPARAM(TRUE,0));
-					SendDlgItemMessage(Dialog, IDC_TERMKANA, WM_SETFONT, (WPARAM)DlgTermFont, MAKELPARAM(TRUE,0));
-					SendDlgItemMessage(Dialog, IDC_TERMKANJISENDLABEL, WM_SETFONT, (WPARAM)DlgTermFont, MAKELPARAM(TRUE,0));
-					SendDlgItemMessage(Dialog, IDC_TERMKANJISEND, WM_SETFONT, (WPARAM)DlgTermFont, MAKELPARAM(TRUE,0));
-					SendDlgItemMessage(Dialog, IDC_TERMKANASEND, WM_SETFONT, (WPARAM)DlgTermFont, MAKELPARAM(TRUE,0));
-					SendDlgItemMessage(Dialog, IDC_TERMKINTEXT, WM_SETFONT, (WPARAM)DlgTermFont, MAKELPARAM(TRUE,0));
-					SendDlgItemMessage(Dialog, IDC_TERMKIN, WM_SETFONT, (WPARAM)DlgTermFont, MAKELPARAM(TRUE,0));
-					SendDlgItemMessage(Dialog, IDC_TERMKOUTTEXT, WM_SETFONT, (WPARAM)DlgTermFont, MAKELPARAM(TRUE,0));
-					SendDlgItemMessage(Dialog, IDC_TERMKOUT, WM_SETFONT, (WPARAM)DlgTermFont, MAKELPARAM(TRUE,0));
-					SendDlgItemMessage(Dialog, IDC_LOCALE_LABEL, WM_SETFONT, (WPARAM)DlgTermFont, MAKELPARAM(TRUE,0));
-					SendDlgItemMessage(Dialog, IDC_LOCALE_EDIT, WM_SETFONT, (WPARAM)DlgTermFont, MAKELPARAM(TRUE,0));
-				}
-				else if (ts->Language==IdRussian) {
-					SendDlgItemMessage(Dialog, IDC_TERMRUSSCHARSET, WM_SETFONT, (WPARAM)DlgTermFont, MAKELPARAM(TRUE,0));
-					SendDlgItemMessage(Dialog, IDC_TERMRUSSHOSTLABEL, WM_SETFONT, (WPARAM)DlgTermFont, MAKELPARAM(TRUE,0));
-					SendDlgItemMessage(Dialog, IDC_TERMRUSSHOST, WM_SETFONT, (WPARAM)DlgTermFont, MAKELPARAM(TRUE,0));
-					SendDlgItemMessage(Dialog, IDC_TERMRUSSCLIENTLABEL, WM_SETFONT, (WPARAM)DlgTermFont, MAKELPARAM(TRUE,0));
-					SendDlgItemMessage(Dialog, IDC_TERMRUSSCLIENT, WM_SETFONT, (WPARAM)DlgTermFont, MAKELPARAM(TRUE,0));
-					SendDlgItemMessage(Dialog, IDC_TERMRUSSFONTLABEL, WM_SETFONT, (WPARAM)DlgTermFont, MAKELPARAM(TRUE,0));
-					SendDlgItemMessage(Dialog, IDC_TERMRUSSFONT, WM_SETFONT, (WPARAM)DlgTermFont, MAKELPARAM(TRUE,0));
-				}
-				else if (ts->Language==IdUtf8 || ts->Language==IdKorean) {
-					SendDlgItemMessage(Dialog, IDC_TERMKANJILABEL, WM_SETFONT, (WPARAM)DlgTermFont, MAKELPARAM(TRUE,0));
-					SendDlgItemMessage(Dialog, IDC_TERMKANJI, WM_SETFONT, (WPARAM)DlgTermFont, MAKELPARAM(TRUE,0));
-					SendDlgItemMessage(Dialog, IDC_TERMKANJISENDLABEL, WM_SETFONT, (WPARAM)DlgTermFont, MAKELPARAM(TRUE,0));
-					SendDlgItemMessage(Dialog, IDC_TERMKANJISEND, WM_SETFONT, (WPARAM)DlgTermFont, MAKELPARAM(TRUE,0));
-					SendDlgItemMessage(Dialog, IDC_LOCALE_LABEL, WM_SETFONT, (WPARAM)DlgTermFont, MAKELPARAM(TRUE,0));
-					SendDlgItemMessage(Dialog, IDC_LOCALE_EDIT, WM_SETFONT, (WPARAM)DlgTermFont, MAKELPARAM(TRUE,0));
-				}
+				static const DlgTextInfo TextInfosJp[] = {
+					{ IDC_TERMKANJILABEL, "DLG_TERM_KANJI" },
+					{ IDC_TERMKANA, "DLG_TERM_KANA" },
+					{ IDC_TERMKANJISENDLABEL, "DLG_TERM_KANJISEND" },
+					{ IDC_TERMKANASEND, "DLG_TERM_KANASEND" },
+					{ IDC_TERMKINTEXT, "DLG_TERM_KIN" },
+					{ IDC_TERMKOUTTEXT, "DLG_TERM_KOUT" },
+					{ IDC_LOCALE_LABEL, "DLG_TERM_LOCALE" },
+				};
+				SetDlgTexts(Dialog, TextInfosJp, _countof(TextInfosJp), UILanguageFile);
 			}
-			else {
-				DlgTermFont = NULL;
-			}
-
-			GetWindowText(Dialog, uimsg2, sizeof(uimsg2));
-			get_lang_msg("DLG_TERM_TITLE", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetWindowText(Dialog, uimsg);
-			GetDlgItemText(Dialog, IDC_TERMWIDTHLABEL, uimsg2, sizeof(uimsg2));
-			get_lang_msg("DLG_TERM_WIDTHLABEL", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDC_TERMWIDTHLABEL, uimsg);
-			GetDlgItemText(Dialog, IDC_TERMISWIN, uimsg2, sizeof(uimsg2));
-			get_lang_msg("DLG_TERM_ISWIN", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDC_TERMISWIN, uimsg);
-			GetDlgItemText(Dialog, IDC_TERMRESIZE, uimsg2, sizeof(uimsg2));
-			get_lang_msg("DLG_TERM_RESIZE", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDC_TERMRESIZE, uimsg);
-			GetDlgItemText(Dialog, IDC_TERMNEWLINE, uimsg2, sizeof(uimsg2));
-			get_lang_msg("DLG_TERM_NEWLINE", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDC_TERMNEWLINE, uimsg);
-			GetDlgItemText(Dialog, IDC_TERMCRRCVLABEL, uimsg2, sizeof(uimsg2));
-			get_lang_msg("DLG_TERM_CRRCV", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDC_TERMCRRCVLABEL, uimsg);
-			GetDlgItemText(Dialog, IDC_TERMCRSENDLABEL, uimsg2, sizeof(uimsg2));
-			get_lang_msg("DLG_TERM_CRSEND", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDC_TERMCRSENDLABEL, uimsg);
-			GetDlgItemText(Dialog, IDC_TERMIDLABEL, uimsg2, sizeof(uimsg2));
-			get_lang_msg("DLG_TERM_ID", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDC_TERMIDLABEL, uimsg);
-			GetDlgItemText(Dialog, IDC_TERMLOCALECHO, uimsg2, sizeof(uimsg2));
-			get_lang_msg("DLG_TERM_LOCALECHO", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDC_TERMLOCALECHO, uimsg);
-			GetDlgItemText(Dialog, IDC_TERMANSBACKTEXT, uimsg2, sizeof(uimsg2));
-			get_lang_msg("DLG_TERM_ANSBACK", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDC_TERMANSBACKTEXT, uimsg);
-			GetDlgItemText(Dialog, IDC_TERMAUTOSWITCH, uimsg2, sizeof(uimsg2));
-			get_lang_msg("DLG_TERM_AUTOSWITCH", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDC_TERMAUTOSWITCH, uimsg);
-			GetDlgItemText(Dialog, IDOK, uimsg2, sizeof(uimsg2));
-			get_lang_msg("BTN_OK", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDOK, uimsg);
-			GetDlgItemText(Dialog, IDCANCEL, uimsg2, sizeof(uimsg2));
-			get_lang_msg("BTN_CANCEL", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDCANCEL, uimsg);
-			GetDlgItemText(Dialog, IDC_TERMHELP, uimsg2, sizeof(uimsg2));
-			get_lang_msg("BTN_HELP", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDC_TERMHELP, uimsg);
-			if ( ts->Language==IdJapanese ) {
-				GetDlgItemText(Dialog, IDC_TERMKANJILABEL, uimsg2, sizeof(uimsg2));
-				get_lang_msg("DLG_TERM_KANJI", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-				SetDlgItemText(Dialog, IDC_TERMKANJILABEL, uimsg);
-				GetDlgItemText(Dialog, IDC_TERMKANA, uimsg2, sizeof(uimsg2));
-				get_lang_msg("DLG_TERM_KANA", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-				SetDlgItemText(Dialog, IDC_TERMKANA, uimsg);
-				GetDlgItemText(Dialog, IDC_TERMKANJISENDLABEL, uimsg2, sizeof(uimsg2));
-				get_lang_msg("DLG_TERM_KANJISEND", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-				SetDlgItemText(Dialog, IDC_TERMKANJISENDLABEL, uimsg);
-				GetDlgItemText(Dialog, IDC_TERMKANASEND, uimsg2, sizeof(uimsg2));
-				get_lang_msg("DLG_TERM_KANASEND", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-				SetDlgItemText(Dialog, IDC_TERMKANASEND, uimsg);
-				GetDlgItemText(Dialog, IDC_TERMKINTEXT, uimsg2, sizeof(uimsg2));
-				get_lang_msg("DLG_TERM_KIN", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-				SetDlgItemText(Dialog, IDC_TERMKINTEXT, uimsg);
-				GetDlgItemText(Dialog, IDC_TERMKOUTTEXT, uimsg2, sizeof(uimsg2));
-				get_lang_msg("DLG_TERM_KOUT", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-				SetDlgItemText(Dialog, IDC_TERMKOUTTEXT, uimsg);
-				GetDlgItemText(Dialog, IDC_LOCALE_LABEL, uimsg2, sizeof(uimsg2));
-				get_lang_msg("DLG_TERM_LOCALE", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-				SetDlgItemText(Dialog, IDC_LOCALE_LABEL, uimsg);
-			}
 			else if ( ts->Language==IdRussian ) {
-				GetDlgItemText(Dialog, IDC_TERMRUSSCHARSET, uimsg2, sizeof(uimsg2));
-				get_lang_msg("DLG_TERM_RUSSCHARSET", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-				SetDlgItemText(Dialog, IDC_TERMRUSSCHARSET, uimsg);
-				GetDlgItemText(Dialog, IDC_TERMRUSSHOSTLABEL, uimsg2, sizeof(uimsg2));
-				get_lang_msg("DLG_TERM_RUSSHOST", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-				SetDlgItemText(Dialog, IDC_TERMRUSSHOSTLABEL, uimsg);
-				GetDlgItemText(Dialog, IDC_TERMRUSSCLIENTLABEL, uimsg2, sizeof(uimsg2));
-				get_lang_msg("DLG_TERM_RUSSCLIENT", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-				SetDlgItemText(Dialog, IDC_TERMRUSSCLIENTLABEL, uimsg);
-				GetDlgItemText(Dialog, IDC_TERMRUSSFONTLABEL, uimsg2, sizeof(uimsg2));
-				get_lang_msg("DLG_TERM_RUSSFONT", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-				SetDlgItemText(Dialog, IDC_TERMRUSSFONTLABEL, uimsg);
+				static const DlgTextInfo TextInfosRu[] = {
+					{ IDC_TERMRUSSCHARSET, "DLG_TERM_RUSSCHARSET" },
+					{ IDC_TERMRUSSHOSTLABEL, "DLG_TERM_RUSSHOST" },
+					{ IDC_TERMRUSSCLIENTLABEL, "DLG_TERM_RUSSCLIENT" },
+					{ IDC_TERMRUSSFONTLABEL, "DLG_TERM_RUSSFONT" },
+				};
+				SetDlgTexts(Dialog, TextInfosRu, _countof(TextInfosRu), UILanguageFile);
 			}
 			else if (ts->Language==IdUtf8 || ts->Language==IdKorean) {
-				GetDlgItemText(Dialog, IDC_TERMKANJILABEL, uimsg2, sizeof(uimsg2));
-				get_lang_msg("DLG_TERMK_KANJI", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-				SetDlgItemText(Dialog, IDC_TERMKANJILABEL, uimsg);
-				GetDlgItemText(Dialog, IDC_TERMKANJISENDLABEL, uimsg2, sizeof(uimsg2));
-				get_lang_msg("DLG_TERMK_KANJISEND", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-				SetDlgItemText(Dialog, IDC_TERMKANJISENDLABEL, uimsg);
-				GetDlgItemText(Dialog, IDC_LOCALE_LABEL, uimsg2, sizeof(uimsg2));
-				get_lang_msg("DLG_TERM_LOCALE", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-				SetDlgItemText(Dialog, IDC_LOCALE_LABEL, uimsg);
+				static const DlgTextInfo TextInfosKo[] = {
+					{ IDC_TERMKANJILABEL, "DLG_TERMK_KANJI" },
+					{ IDC_TERMKANJISENDLABEL, "DLG_TERMK_KANJISEND" },
+					{ IDC_LOCALE_LABEL, "DLG_TERM_LOCALE" },
+				};
+				SetDlgTexts(Dialog, TextInfosKo, _countof(TextInfosKo), UILanguageFile);
 			}
 
 			SetDlgItemInt(Dialog,IDC_TERMWIDTH,ts->TerminalWidth,FALSE);
@@ -368,6 +264,7 @@
 				SetDlgItemText(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:
@@ -475,16 +372,10 @@
 
 					}
 					EndDialog(Dialog, 1);
-					if (DlgTermFont != NULL) {
-						DeleteObject(DlgTermFont);
-					}
 					return TRUE;
 
 				case IDCANCEL:
 					EndDialog(Dialog, 0);
-					if (DlgTermFont != NULL) {
-						DeleteObject(DlgTermFont);
-					}
 					return TRUE;
 
 				case IDC_TERMISWIN:
@@ -611,141 +502,51 @@
 	}
 }
 
-BOOL CALLBACK WinDlg(HWND Dialog, UINT Message, WPARAM wParam, LPARAM lParam)
+static INT_PTR CALLBACK WinDlg(HWND Dialog, UINT Message, WPARAM wParam, LPARAM lParam)
 {
+	static const DlgTextInfo TextInfos[] = {
+		{ 0, "DLG_WIN_TITLE" },
+		{ IDC_WINTITLELABEL, "DLG_WIN_TITLELABEL" },
+		{ IDC_WINCURSOR, "DLG_WIN_CURSOR" },
+		{ IDC_WINBLOCK, "DLG_WIN_BLOCK" },
+		{ IDC_WINVERT, "DLG_WIN_VERT" },
+		{ IDC_WINHORZ, "DLG_WIN_HORZ" },
+		{ IDC_FONTBOLD, "DLG_WIN_BOLDFONT" },
+		{ IDC_WINHIDETITLE, "DLG_WIN_HIDETITLE" },
+		{ IDC_WINHIDEMENU, "DLG_WIN_HIDEMENU" },
+		{ IDC_WINCOLOREMU, "DLG_WIN_COLOREMU" },
+		{ IDC_WINAIXTERM16, "DLG_WIN_AIXTERM16" },
+		{ IDC_WINXTERM256, "DLG_WIN_XTERM256" },
+		{ IDC_WINSCROLL1, "DLG_WIN_SCROLL1" },
+		{ IDC_WINSCROLL3, "DLG_WIN_SCROLL3" },
+		{ IDC_WINCOLOR, "DLG_WIN_COLOR" },
+		{ IDC_WINTEXT, "DLG_WIN_TEXT" },
+		{ IDC_WINBACK, "DLG_WIN_BG" },
+		{ IDC_WINATTRTEXT, "DLG_WIN_ATTRIB" },
+		{ IDC_WINREV, "DLG_WIN_REVERSE" },
+		{ IDC_WINREDLABEL, "DLG_WIN_R" },
+		{ IDC_WINGREENLABEL, "DLG_WIN_G" },
+		{ IDC_WINBLUELABEL, "DLG_WIN_B" },
+		{ IDC_WINUSENORMALBG, "DLG_WIN_ALWAYSBG" },
+		{ IDOK, "BTN_OK" },
+		{ IDCANCEL, "BTN_CANCEL" },
+		{ IDC_WINHELP, "BTN_HELP" },
+		{ IDC_WINCOLOREMU, "DLG_WIN_PCBOLD16" },		// get_lang_msg
+	};
 	PTTSet ts;
 	HWND Wnd, HRed, HGreen, HBlue;
 	int IAttr, IOffset;
 	WORD i, pos, ScrollCode, NewPos;
 	HDC DC;
-	char uimsg[MAX_UIMSG], uimsg2[MAX_UIMSG];
-	LOGFONT logfont;
-	HFONT font;
+	TCHAR uimsg[MAX_UIMSG];
 
 	switch (Message) {
 		case WM_INITDIALOG:
 			ts = (PTTSet)lParam;
-			SetWindowLong(Dialog, DWL_USER, lParam);
+			SetWindowLongPtr(Dialog, DWLP_USER, lParam);
 
-			font = (HFONT)SendMessage(Dialog, WM_GETFONT, 0, 0);
-			GetObject(font, sizeof(LOGFONT), &logfont);
-			if (get_lang_font("DLG_SYSTEM_FONT", Dialog, &logfont, &DlgWinFont, UILanguageFile)) {
-				SendDlgItemMessage(Dialog, IDC_WINTITLELABEL, WM_SETFONT, (WPARAM)DlgWinFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_WINTITLE, WM_SETFONT, (WPARAM)DlgWinFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_WINCURSOR, WM_SETFONT, (WPARAM)DlgWinFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_WINBLOCK, WM_SETFONT, (WPARAM)DlgWinFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_WINVERT, WM_SETFONT, (WPARAM)DlgWinFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_WINHORZ, WM_SETFONT, (WPARAM)DlgWinFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_FONTBOLD, WM_SETFONT, (WPARAM)DlgWinFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_WINHIDETITLE, WM_SETFONT, (WPARAM)DlgWinFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_WINHIDEMENU, WM_SETFONT, (WPARAM)DlgWinFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_WINCOLOREMU, WM_SETFONT, (WPARAM)DlgWinFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_WINAIXTERM16, WM_SETFONT, (WPARAM)DlgWinFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_WINXTERM256, WM_SETFONT, (WPARAM)DlgWinFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_WINSCROLL1, WM_SETFONT, (WPARAM)DlgWinFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_WINSCROLL3, WM_SETFONT, (WPARAM)DlgWinFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_WINSCROLL2, WM_SETFONT, (WPARAM)DlgWinFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_WINCOLOR, WM_SETFONT, (WPARAM)DlgWinFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_WINTEXT, WM_SETFONT, (WPARAM)DlgWinFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_WINBACK, WM_SETFONT, (WPARAM)DlgWinFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_WINREV, WM_SETFONT, (WPARAM)DlgWinFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_WINATTRTEXT, WM_SETFONT, (WPARAM)DlgWinFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_WINATTR, WM_SETFONT, (WPARAM)DlgWinFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_WINREDLABEL, WM_SETFONT, (WPARAM)DlgWinFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_WINRED, WM_SETFONT, (WPARAM)DlgWinFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_WINGREENLABEL, WM_SETFONT, (WPARAM)DlgWinFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_WINGREEN, WM_SETFONT, (WPARAM)DlgWinFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_WINBLUELABEL, WM_SETFONT, (WPARAM)DlgWinFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_WINBLUE, WM_SETFONT, (WPARAM)DlgWinFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_WINUSENORMALBG, WM_SETFONT, (WPARAM)DlgWinFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDOK, WM_SETFONT, (WPARAM)DlgWinFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDCANCEL, WM_SETFONT, (WPARAM)DlgWinFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_WINHELP, WM_SETFONT, (WPARAM)DlgWinFont, MAKELPARAM(TRUE,0));
-			}
-			else {
-				DlgWinFont = NULL;
-			}
-
-			GetWindowText(Dialog, uimsg2, sizeof(uimsg2));
-			get_lang_msg("DLG_WIN_TITLE", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetWindowText(Dialog, uimsg);
-			GetDlgItemText(Dialog, IDC_WINTITLELABEL, uimsg2, sizeof(uimsg2));
-			get_lang_msg("DLG_WIN_TITLELABEL", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDC_WINTITLELABEL, uimsg);
-			GetDlgItemText(Dialog, IDC_WINCURSOR, uimsg2, sizeof(uimsg2));
-			get_lang_msg("DLG_WIN_CURSOR", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDC_WINCURSOR, uimsg);
-			GetDlgItemText(Dialog, IDC_WINBLOCK, uimsg2, sizeof(uimsg2));
-			get_lang_msg("DLG_WIN_BLOCK", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDC_WINBLOCK, uimsg);
-			GetDlgItemText(Dialog, IDC_WINVERT, uimsg2, sizeof(uimsg2));
-			get_lang_msg("DLG_WIN_VERT", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDC_WINVERT, uimsg);
-			GetDlgItemText(Dialog, IDC_WINHORZ, uimsg2, sizeof(uimsg2));
-			get_lang_msg("DLG_WIN_HORZ", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDC_WINHORZ, uimsg);
-			GetDlgItemText(Dialog, IDC_FONTBOLD, uimsg2, sizeof(uimsg2));
-			get_lang_msg("DLG_WIN_BOLDFONT", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDC_FONTBOLD, uimsg);
-			GetDlgItemText(Dialog, IDC_WINHIDETITLE, uimsg2, sizeof(uimsg2));
-			get_lang_msg("DLG_WIN_HIDETITLE", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDC_WINHIDETITLE, uimsg);
-			GetDlgItemText(Dialog, IDC_WINHIDEMENU, uimsg2, sizeof(uimsg2));
-			get_lang_msg("DLG_WIN_HIDEMENU", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDC_WINHIDEMENU, uimsg);
-			GetDlgItemText(Dialog, IDC_WINCOLOREMU, uimsg2, sizeof(uimsg2));
-			get_lang_msg("DLG_WIN_COLOREMU", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDC_WINCOLOREMU, uimsg);
-			GetDlgItemText(Dialog, IDC_WINAIXTERM16, uimsg2, sizeof(uimsg2));
-			get_lang_msg("DLG_WIN_AIXTERM16", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDC_WINAIXTERM16, uimsg);
-			GetDlgItemText(Dialog, IDC_WINXTERM256, uimsg2, sizeof(uimsg2));
-			get_lang_msg("DLG_WIN_XTERM256", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDC_WINXTERM256, uimsg);
-			GetDlgItemText(Dialog, IDC_WINSCROLL1, uimsg2, sizeof(uimsg2));
-			get_lang_msg("DLG_WIN_SCROLL1", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDC_WINSCROLL1, uimsg);
-			GetDlgItemText(Dialog, IDC_WINSCROLL3, uimsg2, sizeof(uimsg2));
-			get_lang_msg("DLG_WIN_SCROLL3", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDC_WINSCROLL3, uimsg);
-			GetDlgItemText(Dialog, IDC_WINCOLOR, uimsg2, sizeof(uimsg2));
-			get_lang_msg("DLG_WIN_COLOR", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDC_WINCOLOR, uimsg);
-			GetDlgItemText(Dialog, IDC_WINTEXT, uimsg2, sizeof(uimsg2));
-			get_lang_msg("DLG_WIN_TEXT", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDC_WINTEXT, uimsg);
-			GetDlgItemText(Dialog, IDC_WINBACK, uimsg2, sizeof(uimsg2));
-			get_lang_msg("DLG_WIN_BG", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDC_WINBACK, uimsg);
-			GetDlgItemText(Dialog, IDC_WINATTRTEXT, uimsg2, sizeof(uimsg2));
-			get_lang_msg("DLG_WIN_ATTRIB", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDC_WINATTRTEXT, uimsg);
-			GetDlgItemText(Dialog, IDC_WINREV, uimsg2, sizeof(uimsg2));
-			get_lang_msg("DLG_WIN_REVERSE", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDC_WINREV, uimsg);
-			GetDlgItemText(Dialog, IDC_WINREDLABEL, uimsg2, sizeof(uimsg2));
-			get_lang_msg("DLG_WIN_R", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDC_WINREDLABEL, uimsg);
-			GetDlgItemText(Dialog, IDC_WINGREENLABEL, uimsg2, sizeof(uimsg2));
-			get_lang_msg("DLG_WIN_G", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDC_WINGREENLABEL, uimsg);
-			GetDlgItemText(Dialog, IDC_WINBLUELABEL, uimsg2, sizeof(uimsg2));
-			get_lang_msg("DLG_WIN_B", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDC_WINBLUELABEL, uimsg);
-			GetDlgItemText(Dialog, IDC_WINUSENORMALBG, uimsg2, sizeof(uimsg2));
-			get_lang_msg("DLG_WIN_ALWAYSBG", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDC_WINUSENORMALBG, uimsg);
-			GetDlgItemText(Dialog, IDOK, uimsg2, sizeof(uimsg2));
-			get_lang_msg("BTN_OK", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDOK, uimsg);
-			GetDlgItemText(Dialog, IDCANCEL, uimsg2, sizeof(uimsg2));
-			get_lang_msg("BTN_CANCEL", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDCANCEL, uimsg);
-			GetDlgItemText(Dialog, IDC_WINHELP, uimsg2, sizeof(uimsg2));
-			get_lang_msg("BTN_HELP", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDC_WINHELP, uimsg);
-
-			SetDlgItemText(Dialog, IDC_WINTITLE, ts->Title);
+			SetDlgTexts(Dialog, TextInfos, _countof(TextInfos), UILanguageFile);
+			SetDlgItemTextA(Dialog, IDC_WINTITLE, ts->Title);
 			SendDlgItemMessage(Dialog, IDC_WINTITLE, EM_LIMITTEXT,
 			                   sizeof(ts->Title)-1, 0);
 
@@ -877,6 +678,8 @@
 
 			ChangeSB(Dialog,ts,IAttr,IOffset);
 
+			CenterWindow(Dialog, GetParent(Dialog));
+
 			return TRUE;
 
 		case WM_COMMAND:
@@ -1057,16 +860,10 @@
 						GetRB(Dialog,&ts->CursorShape,IDC_WINBLOCK,IDC_WINHORZ);
 					}
 					EndDialog(Dialog, 1);
-					if (DlgWinFont != NULL) {
-						DeleteObject(DlgWinFont);
-					}
 					return TRUE;
 
 				case IDCANCEL:
 					EndDialog(Dialog, 0);
-					if (DlgWinFont != NULL) {
-						DeleteObject(DlgWinFont);
-					}
 					return TRUE;
 
 				case IDC_WINHIDETITLE:
@@ -1219,76 +1016,31 @@
 	return FALSE;
 }
 
-BOOL CALLBACK KeybDlg(HWND Dialog, UINT Message, WPARAM wParam, LPARAM lParam)
+static INT_PTR CALLBACK KeybDlg(HWND Dialog, UINT Message, WPARAM wParam, LPARAM lParam)
 {
+	static const DlgTextInfo TextInfos[] = {
+		{ 0, "DLG_KEYB_TITLE" },
+		{ IDC_KEYBTRANS, "DLG_KEYB_TRANSMIT" },
+		{ IDC_KEYBBS, "DLG_KEYB_BS" },
+		{ IDC_KEYBDEL, "DLG_KEYB_DEL" },
+		{ IDC_KEYBKEYBTEXT, "DLG_KEYB_KEYB" },
+		{ IDC_KEYBMETATEXT, "DLG_KEYB_META" },
+		{ IDC_KEYBDISABLE, "DLG_KEYB_DISABLE" },
+		{ IDC_KEYBAPPKEY, "DLG_KEYB_APPKEY" },
+		{ IDC_KEYBAPPCUR, "DLG_KEYB_APPCUR" },
+		{ IDOK, "BTN_OK" },
+		{ IDCANCEL, "BTN_CANCEL" },
+		{ IDC_KEYBHELP, "BTN_HELP" },
+	};
 	PTTSet ts;
-	char uimsg[MAX_UIMSG], uimsg2[MAX_UIMSG];
-	LOGFONT logfont;
-	HFONT font;
 
 	switch (Message) {
 		case WM_INITDIALOG:
 			ts = (PTTSet)lParam;
-			SetWindowLong(Dialog, DWL_USER, lParam);
+			SetWindowLongPtr(Dialog, DWLP_USER, lParam);
 
-			font = (HFONT)SendMessage(Dialog, WM_GETFONT, 0, 0);
-			GetObject(font, sizeof(LOGFONT), &logfont);
-			if (get_lang_font("DLG_SYSTEM_FONT", Dialog, &logfont, &DlgKeybFont, UILanguageFile)) {
-				SendDlgItemMessage(Dialog, IDC_KEYBTRANS, WM_SETFONT, (WPARAM)DlgKeybFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_KEYBBS, WM_SETFONT, (WPARAM)DlgKeybFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_KEYBDEL, WM_SETFONT, (WPARAM)DlgKeybFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_KEYBKEYBTEXT, WM_SETFONT, (WPARAM)DlgKeybFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_KEYBKEYB, WM_SETFONT, (WPARAM)DlgKeybFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_KEYBMETATEXT, WM_SETFONT, (WPARAM)DlgKeybFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_KEYBMETA, WM_SETFONT, (WPARAM)DlgKeybFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_KEYBDISABLE, WM_SETFONT, (WPARAM)DlgKeybFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_KEYBAPPKEY, WM_SETFONT, (WPARAM)DlgKeybFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_KEYBAPPCUR, WM_SETFONT, (WPARAM)DlgKeybFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDOK, WM_SETFONT, (WPARAM)DlgKeybFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDCANCEL, WM_SETFONT, (WPARAM)DlgKeybFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_KEYBHELP, WM_SETFONT, (WPARAM)DlgKeybFont, MAKELPARAM(TRUE,0));
-			}
-			else {
-				DlgKeybFont = NULL;
-			}
+			SetDlgTexts(Dialog, TextInfos, _countof(TextInfos), UILanguageFile);
 
-			GetWindowText(Dialog, uimsg2, sizeof(uimsg2));
-			get_lang_msg("DLG_KEYB_TITLE", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetWindowText(Dialog, uimsg);
-			GetDlgItemText(Dialog, IDC_KEYBTRANS, uimsg2, sizeof(uimsg2));
-			get_lang_msg("DLG_KEYB_TRANSMIT", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDC_KEYBTRANS, uimsg);
-			GetDlgItemText(Dialog, IDC_KEYBBS, uimsg2, sizeof(uimsg2));
-			get_lang_msg("DLG_KEYB_BS", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDC_KEYBBS, uimsg);
-			GetDlgItemText(Dialog, IDC_KEYBDEL, uimsg2, sizeof(uimsg2));
-			get_lang_msg("DLG_KEYB_DEL", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDC_KEYBDEL, uimsg);
-			GetDlgItemText(Dialog, IDC_KEYBKEYBTEXT, uimsg2, sizeof(uimsg2));
-			get_lang_msg("DLG_KEYB_KEYB", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDC_KEYBKEYBTEXT, uimsg);
-			GetDlgItemText(Dialog, IDC_KEYBMETATEXT, uimsg2, sizeof(uimsg2));
-			get_lang_msg("DLG_KEYB_META", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDC_KEYBMETATEXT, uimsg);
-			GetDlgItemText(Dialog, IDC_KEYBDISABLE, uimsg2, sizeof(uimsg2));
-			get_lang_msg("DLG_KEYB_DISABLE", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDC_KEYBDISABLE, uimsg);
-			GetDlgItemText(Dialog, IDC_KEYBAPPKEY, uimsg2, sizeof(uimsg2));
-			get_lang_msg("DLG_KEYB_APPKEY", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDC_KEYBAPPKEY, uimsg);
-			GetDlgItemText(Dialog, IDC_KEYBAPPCUR, uimsg2, sizeof(uimsg2));
-			get_lang_msg("DLG_KEYB_APPCUR", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDC_KEYBAPPCUR, uimsg);
-			GetDlgItemText(Dialog, IDOK, uimsg2, sizeof(uimsg2));
-			get_lang_msg("BTN_OK", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDOK, uimsg);
-			GetDlgItemText(Dialog, IDCANCEL, uimsg2, sizeof(uimsg2));
-			get_lang_msg("BTN_CANCEL", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDCANCEL, uimsg);
-			GetDlgItemText(Dialog, IDC_KEYBHELP, uimsg2, sizeof(uimsg2));
-			get_lang_msg("BTN_HELP", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDC_KEYBHELP, uimsg);
-
 			SetRB(Dialog,ts->BSKey-1,IDC_KEYBBS,IDC_KEYBBS);
 			SetRB(Dialog,ts->DelKey,IDC_KEYBDEL,IDC_KEYBDEL);
 			SetRB(Dialog,ts->MetaKey,IDC_KEYBMETA,IDC_KEYBMETA);
@@ -1306,12 +1058,15 @@
 				ShowDlgItem(Dialog,IDC_KEYBKEYBTEXT,IDC_KEYBKEYB);
 				SetDropDownList(Dialog, IDC_KEYBKEYB, RussList2, ts->RussKeyb);
 			}
+
+			CenterWindow(Dialog, GetParent(Dialog));
+
 			return TRUE;
 
 		case WM_COMMAND:
 			switch (LOWORD(wParam)) {
 				case IDOK:
-					ts = (PTTSet)GetWindowLong(Dialog,DWL_USER);
+					ts = (PTTSet)GetWindowLongPtr(Dialog,DWLP_USER);
 					if ( ts!=NULL ) {
 						WORD w;
 
@@ -1330,16 +1085,10 @@
 						}
 					}
 					EndDialog(Dialog, 1);
-					if (DlgKeybFont != NULL) {
-						DeleteObject(DlgKeybFont);
-					}
 					return TRUE;
 
 				case IDCANCEL:
 					EndDialog(Dialog, 0);
-					if (DlgKeybFont != NULL) {
-						DeleteObject(DlgKeybFont);
-					}
 					return TRUE;
 
 				case IDC_KEYBHELP:
@@ -1354,8 +1103,23 @@
 static PCHAR StopList[] = {"1 bit", "1.5 bit", "2 bit", NULL};
 static PCHAR FlowList[] = {"Xon/Xoff","hardware","none",NULL};
 
-BOOL CALLBACK SerialDlg(HWND Dialog, UINT Message, WPARAM wParam, LPARAM lParam)
+static INT_PTR CALLBACK SerialDlg(HWND Dialog, UINT Message, WPARAM wParam, LPARAM lParam)
 {
+	static const DlgTextInfo TextInfos[] = {
+		{ 0, "DLG_SERIAL_TITLE" },
+		{ IDC_SERIALPORT_LABEL, "DLG_SERIAL_PORT" },
+		{ IDC_SERIALBAUD_LEBAL, "DLG_SERIAL_BAUD" },
+		{ IDC_SERIALDATA_LABEL, "DLG_SERIAL_DATA" },
+		{ IDC_SERIALPARITY_LABEL, "DLG_SERIAL_PARITY" },
+		{ IDC_SERIALSTOP_LABEL, "DLG_SERIAL_STOP" },
+		{ IDC_SERIALFLOW_LABEL, "DLG_SERIAL_FLOW" },
+		{ IDC_SERIALDELAY, "DLG_SERIAL_DELAY" },
+		{ IDC_SERIALDELAYCHAR_LABEL, "DLG_SERIAL_DELAYCHAR" },
+		{ IDC_SERIALDELAYLINE_LABEL, "DLG_SERIAL_DELAYLINE" },
+		{ IDOK, "BTN_OK" },
+		{ IDCANCEL, "BTN_CANCEL" },
+		{ IDC_SERIALHELP, "BTN_HELP" },
+	};
 	PTTSet ts;
 	int i, w, sel;
 	char Temp[128];
@@ -1362,83 +1126,14 @@
 	WORD ComPortTable[MAXCOMPORT];
 	static char *ComPortDesc[MAXCOMPORT];
 	int comports;
-	char uimsg[MAX_UIMSG], uimsg2[MAX_UIMSG];
-	LOGFONT logfont;
-	HFONT font;
 
 	switch (Message) {
 		case WM_INITDIALOG:
 			ts = (PTTSet)lParam;
-			SetWindowLong(Dialog, DWL_USER, lParam);
+			SetWindowLongPtr(Dialog, DWLP_USER, lParam);
 
-			font = (HFONT)SendMessage(Dialog, WM_GETFONT, 0, 0);
-			GetObject(font, sizeof(LOGFONT), &logfont);
-			if (get_lang_font("DLG_SYSTEM_FONT", Dialog, &logfont, &DlgSerialFont, UILanguageFile)) {
-				SendDlgItemMessage(Dialog, IDC_SERIALPORT_LABEL, WM_SETFONT, (WPARAM)DlgSerialFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_SERIALPORT, WM_SETFONT, (WPARAM)DlgSerialFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_SERIALBAUD_LEBAL, WM_SETFONT, (WPARAM)DlgSerialFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_SERIALBAUD, WM_SETFONT, (WPARAM)DlgSerialFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_SERIALDATA_LABEL, WM_SETFONT, (WPARAM)DlgSerialFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_SERIALDATA, WM_SETFONT, (WPARAM)DlgSerialFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_SERIALPARITY_LABEL, WM_SETFONT, (WPARAM)DlgSerialFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_SERIALPARITY, WM_SETFONT, (WPARAM)DlgSerialFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_SERIALSTOP_LABEL, WM_SETFONT, (WPARAM)DlgSerialFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_SERIALSTOP, WM_SETFONT, (WPARAM)DlgSerialFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_SERIALFLOW_LABEL, WM_SETFONT, (WPARAM)DlgSerialFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_SERIALFLOW, WM_SETFONT, (WPARAM)DlgSerialFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_SERIALDELAY, WM_SETFONT, (WPARAM)DlgSerialFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_SERIALDELAYCHAR_LABEL, WM_SETFONT, (WPARAM)DlgSerialFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_SERIALDELAYCHAR, WM_SETFONT, (WPARAM)DlgSerialFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_SERIALDELAYLINE_LABEL, WM_SETFONT, (WPARAM)DlgSerialFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_SERIALDELAYLINE, WM_SETFONT, (WPARAM)DlgSerialFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDOK, WM_SETFONT, (WPARAM)DlgSerialFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDCANCEL, WM_SETFONT, (WPARAM)DlgSerialFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_SERIALHELP, WM_SETFONT, (WPARAM)DlgSerialFont, MAKELPARAM(TRUE,0));
-			}
-			else {
-				DlgSerialFont = NULL;
-			}
+			SetDlgTexts(Dialog, TextInfos, _countof(TextInfos), UILanguageFile);
 
-			GetWindowText(Dialog, uimsg2, sizeof(uimsg2));
-			get_lang_msg("DLG_SERIAL_TITLE", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetWindowText(Dialog, uimsg);
-			GetDlgItemText(Dialog, IDC_SERIALPORT_LABEL, uimsg2, sizeof(uimsg2));
-			get_lang_msg("DLG_SERIAL_PORT", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDC_SERIALPORT_LABEL, uimsg);
-			GetDlgItemText(Dialog, IDC_SERIALBAUD_LEBAL, uimsg2, sizeof(uimsg2));
-			get_lang_msg("DLG_SERIAL_BAUD", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDC_SERIALBAUD_LEBAL, uimsg);
-			GetDlgItemText(Dialog, IDC_SERIALDATA_LABEL, uimsg2, sizeof(uimsg2));
-			get_lang_msg("DLG_SERIAL_DATA", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDC_SERIALDATA_LABEL, uimsg);
-			GetDlgItemText(Dialog, IDC_SERIALPARITY_LABEL, uimsg2, sizeof(uimsg2));
-			get_lang_msg("DLG_SERIAL_PARITY", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDC_SERIALPARITY_LABEL, uimsg);
-			GetDlgItemText(Dialog, IDC_SERIALSTOP_LABEL, uimsg2, sizeof(uimsg2));
-			get_lang_msg("DLG_SERIAL_STOP", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDC_SERIALSTOP_LABEL, uimsg);
-			GetDlgItemText(Dialog, IDC_SERIALFLOW_LABEL, uimsg2, sizeof(uimsg2));
-			get_lang_msg("DLG_SERIAL_FLOW", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDC_SERIALFLOW_LABEL, uimsg);
-			GetDlgItemText(Dialog, IDC_SERIALDELAY, uimsg2, sizeof(uimsg2));
-			get_lang_msg("DLG_SERIAL_DELAY", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDC_SERIALDELAY, uimsg);
-			GetDlgItemText(Dialog, IDC_SERIALDELAYCHAR_LABEL, uimsg2, sizeof(uimsg2));
-			get_lang_msg("DLG_SERIAL_DELAYCHAR", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDC_SERIALDELAYCHAR_LABEL, uimsg);
-			GetDlgItemText(Dialog, IDC_SERIALDELAYLINE_LABEL, uimsg2, sizeof(uimsg2));
-			get_lang_msg("DLG_SERIAL_DELAYLINE", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDC_SERIALDELAYLINE_LABEL, uimsg);
-			GetDlgItemText(Dialog, IDOK, uimsg2, sizeof(uimsg2));
-			get_lang_msg("BTN_OK", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDOK, uimsg);
-			GetDlgItemText(Dialog, IDCANCEL, uimsg2, sizeof(uimsg2));
-			get_lang_msg("BTN_CANCEL", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDCANCEL, uimsg);
-			GetDlgItemText(Dialog, IDC_SERIALHELP, uimsg2, sizeof(uimsg2));
-			get_lang_msg("BTN_HELP", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDC_SERIALHELP, uimsg);
-
 			w = 0;
 
 			if ((comports = DetectComPorts(ComPortTable, ts->MaxComPort, ComPortDesc)) > 0) {
@@ -1501,6 +1196,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:
@@ -1543,16 +1240,10 @@
 					}
 
 					EndDialog(Dialog, 1);
-					if (DlgSerialFont != NULL) {
-						DeleteObject(DlgSerialFont);
-					}
 					return TRUE;
 
 				case IDCANCEL:
 					EndDialog(Dialog, 0);
-					if (DlgSerialFont != NULL) {
-						DeleteObject(DlgSerialFont);
-					}
 					return TRUE;
 
 				case IDC_SERIALHELP:
@@ -1562,8 +1253,26 @@
 	return FALSE;
 }
 
-BOOL CALLBACK TCPIPDlg(HWND Dialog, UINT Message, WPARAM wParam, LPARAM lParam)
+static INT_PTR CALLBACK TCPIPDlg(HWND Dialog, UINT Message, WPARAM wParam, LPARAM lParam)
 {
+	static const DlgTextInfo TextInfos[] = {
+		{ 0, "DLG_TCPIP_TITLE" },
+		{ IDC_TCPIPHOSTLIST, "DLG_TCPIP_HOSTLIST" },
+		{ IDC_TCPIPADD, "DLG_TCPIP_ADD" },
+		{ IDC_TCPIPUP, "DLG_TCPIP_UP" },
+		{ IDC_TCPIPREMOVE, "DLG_TCPIP_REMOVE" },
+		{ IDC_TCPIPDOWN, "DLG_TCPIP_DOWN" },
+		{ IDC_TCPIPHISTORY, "DLG_TCPIP_HISTORY" },
+		{ IDC_TCPIPAUTOCLOSE, "DLG_TCPIP_AUTOCLOSE" },
+		{ IDC_TCPIPPORTLABEL, "DLG_TCPIP_PORT" },
+		{ IDC_TCPIPTELNET, "DLG_TCPIP_TELNET" },
+		{ IDC_TCPIPTELNETKEEPALIVELABEL, "DLG_TCPIP_KEEPALIVE" },
+		{ IDC_TCPIPTELNETKEEPALIVESEC, "DLG_TCPIP_KEEPALIVE_SEC" },
+		{ IDC_TCPIPTERMTYPELABEL, "DLG_TCPIP_TERMTYPE" },
+		{ IDOK, "BTN_OK" },
+		{ IDCANCEL, "BTN_CANCEL" },
+		{ IDC_TCPIPHELP, "BTN_HELP" },
+	};
 	PTTSet ts;
 	char EntName[10];
 	char TempHost[HostNameMaxLength+1];
@@ -1570,92 +1279,14 @@
 	UINT i, Index;
 	WORD w;
 	BOOL Ok;
-	char uimsg[MAX_UIMSG], uimsg2[MAX_UIMSG];
-	LOGFONT logfont;
-	HFONT font;
 
 	switch (Message) {
 		case WM_INITDIALOG:
 			ts = (PTTSet)lParam;
-			SetWindowLong(Dialog, DWL_USER, lParam);
+			SetWindowLongPtr(Dialog, DWLP_USER, lParam);
 
-			font = (HFONT)SendMessage(Dialog, WM_GETFONT, 0, 0);
-			GetObject(font, sizeof(LOGFONT), &logfont);
-			if (get_lang_font("DLG_SYSTEM_FONT", Dialog, &logfont, &DlgTcpipFont, UILanguageFile)) {
-				SendDlgItemMessage(Dialog, IDC_TCPIPHOSTLIST, WM_SETFONT, (WPARAM)DlgTcpipFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_TCPIPHOST, WM_SETFONT, (WPARAM)DlgTcpipFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_TCPIPADD, WM_SETFONT, (WPARAM)DlgTcpipFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_TCPIPLIST, WM_SETFONT, (WPARAM)DlgTcpipFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_TCPIPUP, WM_SETFONT, (WPARAM)DlgTcpipFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_TCPIPREMOVE, WM_SETFONT, (WPARAM)DlgTcpipFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_TCPIPDOWN, WM_SETFONT, (WPARAM)DlgTcpipFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_TCPIPTELNETKEEPALIVELABEL, WM_SETFONT, (WPARAM)DlgTcpipFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_TCPIPTELNETKEEPALIVE, WM_SETFONT, (WPARAM)DlgTcpipFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_TCPIPTELNETKEEPALIVESEC, WM_SETFONT, (WPARAM)DlgTcpipFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_TCPIPHISTORY, WM_SETFONT, (WPARAM)DlgTcpipFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_TCPIPAUTOCLOSE, WM_SETFONT, (WPARAM)DlgTcpipFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_TCPIPPORTLABEL, WM_SETFONT, (WPARAM)DlgTcpipFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_TCPIPPORT, WM_SETFONT, (WPARAM)DlgTcpipFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_TCPIPTELNET, WM_SETFONT, (WPARAM)DlgTcpipFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_TCPIPTERMTYPELABEL, WM_SETFONT, (WPARAM)DlgTcpipFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_TCPIPTERMTYPE, WM_SETFONT, (WPARAM)DlgTcpipFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDOK, WM_SETFONT, (WPARAM)DlgTcpipFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDCANCEL, WM_SETFONT, (WPARAM)DlgTcpipFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_TCPIPHELP, WM_SETFONT, (WPARAM)DlgTcpipFont, MAKELPARAM(TRUE,0));
-			}
-			else {
-				DlgTcpipFont = NULL;
-			}
-
-			GetWindowText(Dialog, uimsg2, sizeof(uimsg2));
-			get_lang_msg("DLG_TCPIP_TITLE", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetWindowText(Dialog, uimsg);
-			GetDlgItemText(Dialog, IDC_TCPIPHOSTLIST, uimsg2, sizeof(uimsg2));
-			get_lang_msg("DLG_TCPIP_HOSTLIST", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDC_TCPIPHOSTLIST, uimsg);
-			GetDlgItemText(Dialog, IDC_TCPIPADD, uimsg2, sizeof(uimsg2));
-			get_lang_msg("DLG_TCPIP_ADD", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDC_TCPIPADD, uimsg);
-			GetDlgItemText(Dialog, IDC_TCPIPUP, uimsg2, sizeof(uimsg2));
-			get_lang_msg("DLG_TCPIP_UP", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDC_TCPIPUP, uimsg);
-			GetDlgItemText(Dialog, IDC_TCPIPREMOVE, uimsg2, sizeof(uimsg2));
-			get_lang_msg("DLG_TCPIP_REMOVE", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDC_TCPIPREMOVE, uimsg);
-			GetDlgItemText(Dialog, IDC_TCPIPDOWN, uimsg2, sizeof(uimsg2));
-			get_lang_msg("DLG_TCPIP_DOWN", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDC_TCPIPDOWN, uimsg);
-			GetDlgItemText(Dialog, IDC_TCPIPHISTORY, uimsg2, sizeof(uimsg2));
-			get_lang_msg("DLG_TCPIP_HISTORY", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDC_TCPIPHISTORY, uimsg);
-			GetDlgItemText(Dialog, IDC_TCPIPAUTOCLOSE, uimsg2, sizeof(uimsg2));
-			get_lang_msg("DLG_TCPIP_AUTOCLOSE", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDC_TCPIPAUTOCLOSE, uimsg);
-			GetDlgItemText(Dialog, IDC_TCPIPPORTLABEL, uimsg2, sizeof(uimsg2));
-			get_lang_msg("DLG_TCPIP_PORT", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDC_TCPIPPORTLABEL, uimsg);
-			GetDlgItemText(Dialog, IDC_TCPIPTELNET, uimsg2, sizeof(uimsg2));
-			get_lang_msg("DLG_TCPIP_TELNET", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDC_TCPIPTELNET, uimsg);
-			GetDlgItemText(Dialog, IDC_TCPIPTELNETKEEPALIVELABEL, uimsg2, sizeof(uimsg2));
-			get_lang_msg("DLG_TCPIP_KEEPALIVE", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDC_TCPIPTELNETKEEPALIVELABEL, uimsg);
-			GetDlgItemText(Dialog, IDC_TCPIPTELNETKEEPALIVESEC, uimsg2, sizeof(uimsg2));
-			get_lang_msg("DLG_TCPIP_KEEPALIVE_SEC", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDC_TCPIPTELNETKEEPALIVESEC, uimsg);
-			GetDlgItemText(Dialog, IDC_TCPIPTERMTYPELABEL, uimsg2, sizeof(uimsg2));
-			get_lang_msg("DLG_TCPIP_TERMTYPE", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDC_TCPIPTERMTYPELABEL, uimsg);
-			GetDlgItemText(Dialog, IDOK, uimsg2, sizeof(uimsg2));
-			get_lang_msg("BTN_OK", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDOK, uimsg);
-			GetDlgItemText(Dialog, IDCANCEL, uimsg2, sizeof(uimsg2));
-			get_lang_msg("BTN_CANCEL", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDCANCEL, uimsg);
-			GetDlgItemText(Dialog, IDC_TCPIPHELP, uimsg2, sizeof(uimsg2));
-			get_lang_msg("BTN_HELP", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDC_TCPIPHELP, uimsg);
-
+			SetDlgTexts(Dialog, TextInfos, _countof(TextInfos), UILanguageFile);
+				
 			SendDlgItemMessage(Dialog, IDC_TCPIPHOST, EM_LIMITTEXT,
 			                   HostNameMaxLength-1, 0);
 
@@ -1685,6 +1316,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:
@@ -1722,16 +1355,10 @@
 						               sizeof(ts->TermType));
 					}
 					EndDialog(Dialog, 1);
-					if (DlgTcpipFont != NULL) {
-						DeleteObject(DlgTcpipFont);
-					}
 					return TRUE;
 
 				case IDCANCEL:
 					EndDialog(Dialog, 0);
-					if (DlgTcpipFont != NULL) {
-						DeleteObject(DlgTcpipFont);
-					}
 					return TRUE;
 
 				case IDC_TCPIPHOST:
@@ -1864,8 +1491,19 @@
 	return FALSE;
 }
 
-BOOL CALLBACK HostDlg(HWND Dialog, UINT Message, WPARAM wParam, LPARAM lParam)
+static INT_PTR CALLBACK HostDlg(HWND Dialog, UINT Message, WPARAM wParam, LPARAM lParam)
 {
+	static const DlgTextInfo TextInfos[] = {
+		{ 0, "DLG_HOST_TITLE" },
+		{ IDC_HOSTNAMELABEL, "DLG_HOST_TCPIPHOST" },
+		{ IDC_HOSTTCPPORTLABEL, "DLG_HOST_TCPIPPORT" },
+		{ IDC_HOSTTCPPROTOCOLLABEL, "DLG_HOST_TCPIPPROTOCOL" },
+		{ IDC_HOSTSERIAL, "DLG_HOST_SERIAL" },
+		{ IDC_HOSTCOMLABEL, "DLG_HOST_SERIALPORT" },
+		{ IDOK, "BTN_OK" },
+		{ IDCANCEL, "BTN_CANCEL" },
+		{ IDC_HOSTHELP, "BTN_HELP" },
+	};
 	PGetHNRec GetHNRec;
 	char EntName[128];
 	char TempHost[HostNameMaxLength+1];
@@ -1874,65 +1512,14 @@
 	WORD ComPortTable[MAXCOMPORT];
 	static char *ComPortDesc[MAXCOMPORT];
 	int comports;
-	char uimsg[MAX_UIMSG], uimsg2[MAX_UIMSG];
-	LOGFONT logfont;
-	HFONT font;
 
 	switch (Message) {
 		case WM_INITDIALOG:
 			GetHNRec = (PGetHNRec)lParam;
-			SetWindowLong(Dialog, DWL_USER, lParam);
+			SetWindowLongPtr(Dialog, DWLP_USER, lParam);
 
-			font = (HFONT)SendMessage(Dialog, WM_GETFONT, 0, 0);
-			GetObject(font, sizeof(LOGFONT), &logfont);
-			if (get_lang_font("DLG_SYSTEM_FONT", Dialog, &logfont, &DlgHostFont, UILanguageFile)) {
-				SendDlgItemMessage(Dialog, IDC_HOSTTCPIP, WM_SETFONT, (WPARAM)DlgHostFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_HOSTNAMELABEL, WM_SETFONT, (WPARAM)DlgHostFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_HOSTNAME, WM_SETFONT, (WPARAM)DlgHostFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_HOSTTELNET, WM_SETFONT, (WPARAM)DlgHostFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_HOSTTCPPORTLABEL, WM_SETFONT, (WPARAM)DlgHostFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_HOSTTCPPORT, WM_SETFONT, (WPARAM)DlgHostFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_HOSTTCPPROTOCOLLABEL, WM_SETFONT, (WPARAM)DlgHostFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_HOSTTCPPROTOCOL, WM_SETFONT, (WPARAM)DlgHostFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_HOSTSERIAL, WM_SETFONT, (WPARAM)DlgHostFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_HOSTCOMLABEL, WM_SETFONT, (WPARAM)DlgHostFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_HOSTCOM, WM_SETFONT, (WPARAM)DlgHostFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDOK, WM_SETFONT, (WPARAM)DlgHostFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDCANCEL, WM_SETFONT, (WPARAM)DlgHostFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_HOSTHELP, WM_SETFONT, (WPARAM)DlgHostFont, MAKELPARAM(TRUE,0));
-			}
-			else {
-				DlgHostFont = NULL;
-			}
-
-			GetWindowText(Dialog, uimsg2, sizeof(uimsg2));
-			get_lang_msg("DLG_HOST_TITLE", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetWindowText(Dialog, uimsg);
-			GetDlgItemText(Dialog, IDC_HOSTNAMELABEL, uimsg2, sizeof(uimsg2));
-			get_lang_msg("DLG_HOST_TCPIPHOST", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDC_HOSTNAMELABEL, uimsg);
-			GetDlgItemText(Dialog, IDC_HOSTTCPPORTLABEL, uimsg2, sizeof(uimsg2));
-			get_lang_msg("DLG_HOST_TCPIPPORT", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDC_HOSTTCPPORTLABEL, uimsg);
-			GetDlgItemText(Dialog, IDC_HOSTTCPPROTOCOLLABEL, uimsg2, sizeof(uimsg2));
-			get_lang_msg("DLG_HOST_TCPIPPROTOCOL", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDC_HOSTTCPPROTOCOLLABEL, uimsg);
-			GetDlgItemText(Dialog, IDC_HOSTSERIAL, uimsg2, sizeof(uimsg2));
-			get_lang_msg("DLG_HOST_SERIAL", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDC_HOSTSERIAL, uimsg);
-			GetDlgItemText(Dialog, IDC_HOSTCOMLABEL, uimsg2, sizeof(uimsg2));
-			get_lang_msg("DLG_HOST_SERIALPORT", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDC_HOSTCOMLABEL, uimsg);
-			GetDlgItemText(Dialog, IDOK, uimsg2, sizeof(uimsg2));
-			get_lang_msg("BTN_OK", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDOK, uimsg);
-			GetDlgItemText(Dialog, IDCANCEL, uimsg2, sizeof(uimsg2));
-			get_lang_msg("BTN_CANCEL", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDCANCEL, uimsg);
-			GetDlgItemText(Dialog, IDC_HOSTHELP, uimsg2, sizeof(uimsg2));
-			get_lang_msg("BTN_HELP", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDC_HOSTHELP, uimsg);
-
+			SetDlgTexts(Dialog, TextInfos, _countof(TextInfos), UILanguageFile);
+		
 			// \x83t\x83@\x83C\x83\x8B\x82\xA8\x82\xE6\x82і\xBC\x91O\x95t\x82\xAB\x83p\x83C\x83v\x82̏ꍇ\x81ATCP/IP\x88\xB5\x82\xA2\x82Ƃ\xB7\x82\xE9\x81B
 			if ( GetHNRec->PortType==IdFile ||
 				 GetHNRec->PortType==IdNamedPipe
@@ -2029,6 +1616,8 @@
 				DisableDlgItem(Dialog,IDC_HOSTTCPPROTOCOLLABEL,IDC_HOSTTCPPROTOCOL);
 			}
 
+			CenterWindow(Dialog, GetParent(Dialog));
+
 			return TRUE;
 
 		case WM_COMMAND:
@@ -2074,16 +1663,10 @@
 						}
 					}
 					EndDialog(Dialog, 1);
-					if (DlgHostFont != NULL) {
-						DeleteObject(DlgHostFont);
-					}
 					return TRUE;
 
 				case IDCANCEL:
 					EndDialog(Dialog, 0);
-					if (DlgHostFont != NULL) {
-						DeleteObject(DlgHostFont);
-					}
 					return TRUE;
 
 				case IDC_HOSTTCPIP:
@@ -2138,8 +1721,16 @@
 	return FALSE;
 }
 
-BOOL CALLBACK DirDlg(HWND Dialog, UINT Message, WPARAM wParam, LPARAM lParam)
+static INT_PTR CALLBACK DirDlg(HWND Dialog, UINT Message, WPARAM wParam, LPARAM lParam)
 {
+	static const DlgTextInfo TextInfos[] = {
+		{ 0, "DLG_DIR_TITLE" },
+		{ IDC_DIRCURRENT_LABEL, "DLG_DIR_CURRENT" },
+		{ IDC_DIRNEW_LABEL, "DLG_DIR_NEW" },
+		{ IDOK, "BTN_OK" },
+		{ IDCANCEL, "BTN_CANCEL" },
+		{ IDC_DIRHELP, "BTN_HELP" },
+	};
 	PCHAR CurDir;
 	char HomeDir[MAXPATHLEN];
 	char TmpDir[MAXPATHLEN];
@@ -2151,47 +1742,14 @@
 	int WX, WY, WW, WH, CW, DW, DH, BW, BH, SW, SH;
 	char uimsg[MAX_UIMSG], uimsg2[MAX_UIMSG];
 	char buf[MAX_PATH], buf2[MAX_PATH];
-	LOGFONT logfont;
-	HFONT font;
 
 	switch (Message) {
 		case WM_INITDIALOG:
-			font = (HFONT)SendMessage(Dialog, WM_GETFONT, 0, 0);
-			GetObject(font, sizeof(LOGFONT), &logfont);
-			if (get_lang_font("DLG_SYSTEM_FONT", Dialog, &logfont, &DlgDirFont, UILanguageFile)) {
-				SendDlgItemMessage(Dialog, IDC_DIRCURRENT_LABEL, WM_SETFONT, (WPARAM)DlgDirFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_DIRCURRENT, WM_SETFONT, (WPARAM)DlgDirFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_DIRNEW_LABEL, WM_SETFONT, (WPARAM)DlgDirFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_DIRNEW, WM_SETFONT, (WPARAM)DlgDirFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDOK, WM_SETFONT, (WPARAM)DlgDirFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDCANCEL, WM_SETFONT, (WPARAM)DlgDirFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_DIRHELP, WM_SETFONT, (WPARAM)DlgDirFont, MAKELPARAM(TRUE,0));
-			}
-			else {
-				DlgDirFont = NULL;
-			}
 
-			GetWindowText(Dialog, uimsg2, sizeof(uimsg2));
-			get_lang_msg("DLG_DIR_TITLE", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetWindowText(Dialog, uimsg);
-			GetDlgItemText(Dialog, IDC_DIRCURRENT_LABEL, uimsg2, sizeof(uimsg2));
-			get_lang_msg("DLG_DIR_CURRENT", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDC_DIRCURRENT_LABEL, uimsg);
-			GetDlgItemText(Dialog, IDC_DIRNEW_LABEL, uimsg2, sizeof(uimsg2));
-			get_lang_msg("DLG_DIR_NEW", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDC_DIRNEW_LABEL, uimsg);
-			GetDlgItemText(Dialog, IDOK, uimsg2, sizeof(uimsg2));
-			get_lang_msg("BTN_OK", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDOK, uimsg);
-			GetDlgItemText(Dialog, IDCANCEL, uimsg2, sizeof(uimsg2));
-			get_lang_msg("BTN_CANCEL", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDCANCEL, uimsg);
-			GetDlgItemText(Dialog, IDC_DIRHELP, uimsg2, sizeof(uimsg2));
-			get_lang_msg("BTN_HELP", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDC_DIRHELP, uimsg);
-
+			SetDlgTexts(Dialog, TextInfos, _countof(TextInfos), UILanguageFile);
+				
 			CurDir = (PCHAR)(lParam);
-			SetWindowLong(Dialog, DWL_USER, lParam);
+			SetWindowLongPtr(Dialog, DWLP_USER, lParam);
 
 			SetDlgItemText(Dialog, IDC_DIRCURRENT, CurDir);
 			SendDlgItemMessage(Dialog, IDC_DIRNEW, EM_LIMITTEXT,
@@ -2265,6 +1823,8 @@
 			// resize dialog
 			MoveWindow(Dialog,WX,WY,WW,WH,TRUE);
 
+			CenterWindow(Dialog, GetParent(Dialog));
+
 			return TRUE;
 
 		case WM_COMMAND:
@@ -2288,16 +1848,10 @@
 						_chdir(HomeDir);
 					}
 					EndDialog(Dialog, 1);
-					if (DlgDirFont != NULL) {
-						DeleteObject(DlgDirFont);
-					}
 					return TRUE;
 
 				case IDCANCEL:
 					EndDialog(Dialog, 0);
-					if (DlgDirFont != NULL) {
-						DeleteObject(DlgDirFont);
-					}
 					return TRUE;
 
 				case IDC_SELECT_DIR:
@@ -2494,7 +2048,6 @@
 {
 	HFONT hFont;
 	LOGFONT lf;
-	LONG_PTR lptr;
 
 	//SetCapture(hWnd);
 
@@ -2503,7 +2056,7 @@
 	}
 
 	// \x90e\x82̃v\x83\x8D\x83V\x81[\x83W\x83\x83\x82\xF0\x83T\x83u\x83N\x83\x89\x83X\x82\xA9\x82\xE7\x8EQ\x8FƂł\xAB\x82\xE9\x82悤\x82ɁA\x83|\x83C\x83\x93\x83^\x82\xF0\x93o\x98^\x82\xB5\x82Ă\xA8\x82\xAD\x81B
-	lptr = SetWindowLongPtr( hWnd, GWLP_USERDATA, (LONG_PTR)parent );
+	SetWindowLongPtr( hWnd, GWLP_USERDATA, (LONG_PTR)parent );
 	// \x83T\x83u\x83N\x83\x89\x83X\x82̃v\x83\x8D\x83V\x81[\x83W\x83\x83\x82\xF0\x93o\x98^\x82\xB7\x82\xE9\x81B
 	parent->proc = (WNDPROC)SetWindowLongPtr( hWnd, GWLP_WNDPROC, (LONG_PTR)UrlWndProc);
 
@@ -2520,9 +2073,88 @@
 	parent->timer_done = 0;
 }
 
+#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];
+	int msc_ver, vs_ver, msc_low_ver;
 
-BOOL CALLBACK AboutDlg(HWND Dialog, UINT Message, WPARAM wParam, LPARAM lParam)
+	strcpy(buf, "Microsoft Visual C++ ");
+#ifdef _MSC_FULL_VER
+	// VS2015\x82ł\xCD Compiler version = 19 \x82\xBE\x82\xAA\x81AVisual Studio version = 14 \x82ƂȂ\xC1\x82Ă\xA2\x82邽\x82߁A
+	// \x8C\xB8\x8EZ\x82𒲐\xAE\x82\xB7\x82\xE9\x81B
+	// (2015.12.23 yutaka)
+	msc_ver = (_MSC_FULL_VER / 10000000);
+	msc_low_ver = (_MSC_FULL_VER / 100000) % 100;
+	if (msc_ver < 19) {
+		vs_ver = msc_ver - 6;
+	}
+	else {
+		// 1900 = VS2015(VC++14)
+		// 1910 = VS2017(VC++15)
+		// 1911 = VS2017 update3-4(VC++15)
+		// 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 + (msc_low_ver - 10)/10;
+			msc_low_ver = 0;
+		}
+		else {
+			vs_ver = msc_ver - 5;
+		}
+	}
+
+	_snprintf_s(tmpbuf, sizeof(tmpbuf), _TRUNCATE, " %d.%d",
+				vs_ver,
+				msc_low_ver);
+	strncat_s(buf, buf_size, tmpbuf, _TRUNCATE);
+	if (_MSC_FULL_VER % 100000) {
+		_snprintf_s(tmpbuf, sizeof(tmpbuf), _TRUNCATE, " build %d",
+					_MSC_FULL_VER % 100000);
+		strncat_s(buf, buf_size, tmpbuf, _TRUNCATE);
+	}
+#elif defined(_MSC_VER)
+	_snprintf_s(tmpbuf, sizeof(tmpbuf), _TRUNCATE, " %d.%d",
+				(_MSC_VER / 100) - 6,
+				_MSC_VER % 100);
+	strncat_s(buf, buf_size, tmpbuf, _TRUNCATE);
+#endif
+}
+
+#elif defined(__MINGW32__)
+static void GetCompilerInfo(char *buf, size_t buf_size)
 {
+#if defined(__GNUC__) || defined(__clang__)
+	_snprintf_s(buf, buf_size, _TRUNCATE,
+				"mingw " __MINGW64_VERSION_STR " "
+#if defined(__clang__)
+				"clang " __clang_version__
+#elif defined(__GNUC__)
+				"gcc " __VERSION__
+#endif
+		);
+#else
+	strncat_s(buf, buf_size, "mingw", _TRUNCATE);
+#endif
+}
+
+#else
+static void GetCompilerInfo(char *buf, size_t buf_size)
+{
+	strncpy_s(buf, buf_size, "unknown compiler");
+}
+#endif
+
+static INT_PTR CALLBACK AboutDlg(HWND Dialog, UINT Message, WPARAM wParam, LPARAM lParam)
+{
+	static const DlgTextInfo TextInfos[] = {
+		{ 0, "DLG_ABOUT_TITLE" },
+	};
 	char buf[128], tmpbuf[128];
 	HDC hdc;
 	HWND hwnd;
@@ -2530,10 +2162,7 @@
 	DWORD dwExt;
 	WORD w, h;
 	POINT point;
-	char uimsg[MAX_UIMSG], uimsg2[MAX_UIMSG];
-	LOGFONT logfont;
-	HFONT font;
-	int msc_ver, vs_ver, msc_low_ver;
+	char uimsg[MAX_UIMSG];
 
 #if defined(EFFECT_ENABLED) || defined(TEXTURE_ENABLED)
 	// for animation
@@ -2559,31 +2188,6 @@
 
 	switch (Message) {
 		case WM_INITDIALOG:
-
-			font = (HFONT)SendMessage(Dialog, WM_GETFONT, 0, 0);
-			GetObject(font, sizeof(LOGFONT), &logfont);
-			if (get_lang_font("DLG_SYSTEM_FONT", Dialog, &logfont, &DlgAboutFont, UILanguageFile)) {
-				SendDlgItemMessage(Dialog, IDC_TT_PRO, WM_SETFONT, (WPARAM)DlgAboutFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_TT_VERSION, WM_SETFONT, (WPARAM)DlgAboutFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_INLUCDE_LABEL, WM_SETFONT, (WPARAM)DlgAboutFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_ONIGURUMA_LABEL, WM_SETFONT, (WPARAM)DlgAboutFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_TT23_LABEL, WM_SETFONT, (WPARAM)DlgAboutFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_TT23DATE_LABEL, WM_SETFONT, (WPARAM)DlgAboutFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_TERANISHI_LABEL, WM_SETFONT, (WPARAM)DlgAboutFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_PROJECT_LABEL, WM_SETFONT, (WPARAM)DlgAboutFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_RIGHTS_LABEL, WM_SETFONT, (WPARAM)DlgAboutFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_AUTHOR_LABEL, WM_SETFONT, (WPARAM)DlgAboutFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_AUTHOR_URL, WM_SETFONT, (WPARAM)DlgAboutFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_FORUM_LABEL, WM_SETFONT, (WPARAM)DlgAboutFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_FORUM_URL, WM_SETFONT, (WPARAM)DlgAboutFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_BUILDTIME, WM_SETFONT, (WPARAM)DlgAboutFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_BUILDTOOL, WM_SETFONT, (WPARAM)DlgAboutFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDOK, WM_SETFONT, (WPARAM)DlgAboutFont, MAKELPARAM(TRUE,0));
-			}
-			else {
-				DlgAboutFont = NULL;
-			}
-
 			// \x83A\x83C\x83R\x83\x93\x82𓮓I\x82ɃZ\x83b\x83g
 			{
 				int fuLoad = LR_DEFAULTCOLOR;
@@ -2606,9 +2210,7 @@
 #endif
 			}
 
-			GetWindowText(Dialog, uimsg2, sizeof(uimsg2));
-			get_lang_msg("DLG_ABOUT_TITLE", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetWindowText(Dialog, uimsg);
+			SetDlgTexts(Dialog, TextInfos, _countof(TextInfos), UILanguageFile);
 
 			// Tera Term \x96{\x91̂̃o\x81[\x83W\x83\x87\x83\x93
 			_snprintf_s(buf, sizeof(buf), _TRUNCATE, "Version %d.%d", TT_VERSION_MAJOR, TT_VERSION_MINOR);
@@ -2619,7 +2221,7 @@
 			_snprintf_s(tmpbuf, sizeof(tmpbuf), _TRUNCATE, " (SVN# UNK)");
 			strncat_s(buf, sizeof(buf), tmpbuf, _TRUNCATE);
 #endif
-			SendMessage(GetDlgItem(Dialog, IDC_TT_VERSION), WM_SETTEXT, 0, (LPARAM)buf);
+			SetDlgItemTextA(Dialog, IDC_TT_VERSION, buf);
 
 			// Oniguruma\x82̃o\x81[\x83W\x83\x87\x83\x93\x82\xF0\x90ݒ肷\x82\xE9
 			// \x83o\x81[\x83W\x83\x87\x83\x93\x82̎擾\x82\xCD onig_version() \x82\xF0\x8CĂяo\x82\xB7\x82̂\xAA\x93K\x90؂\xBE\x82\xAA\x81A\x82\xBB\x82̂\xBD\x82߂\xBE\x82\xAF\x82Ƀ\x89\x83C\x83u\x83\x89\x83\x8A\x82\xF0
@@ -2629,63 +2231,22 @@
 			// \x83\x89\x83C\x83u\x83\x89\x83\x8A\x82\xF0\x83\x8A\x83\x93\x83N\x82\xB5\x81A\x90\xB3\x8BK\x82̎菇\x82Ńo\x81[\x83W\x83\x87\x83\x93\x82𓾂邱\x82Ƃɂ\xB5\x82\xBD\x81B
 			// (2006.7.24 yutaka)
 			_snprintf_s(buf, sizeof(buf), _TRUNCATE, "Oniguruma %s", onig_version());
-			SendMessage(GetDlgItem(Dialog, IDC_ONIGURUMA_LABEL), WM_SETTEXT, 0, (LPARAM)buf);
+			SetDlgItemTextA(Dialog, IDC_ONIGURUMA_LABEL, buf);
 
-			// \x83r\x83\x8B\x83h\x82\xB5\x82\xBD\x82Ƃ\xAB\x82Ɏg\x82\xED\x82ꂽVisual C++\x82̃o\x81[\x83W\x83\x87\x83\x93\x82\xF0\x90ݒ肷\x82\xE9\x81B(2009.3.3 yutaka)
-			_snprintf_s(buf, sizeof(buf), _TRUNCATE, "Built using Microsoft Visual C++");
-#ifdef _MSC_FULL_VER
-			// VS2015\x82ł\xCD Compiler version = 19 \x82\xBE\x82\xAA\x81AVisual Studio version = 14 \x82ƂȂ\xC1\x82Ă\xA2\x82邽\x82߁A
-			// \x8C\xB8\x8EZ\x82𒲐\xAE\x82\xB7\x82\xE9\x81B
-			// (2015.12.23 yutaka)
-			msc_ver = (_MSC_FULL_VER / 10000000);
-			msc_low_ver = (_MSC_FULL_VER / 100000) % 100;
-			if (msc_ver < 19) {
-				vs_ver = msc_ver - 6;
-			}
-			else {
-				// 1900 = VS2015(VC++14)
-				// 1910 = VS2017(VC++15)
-				// 1911 = VS2017 update3-4(VC++15)
-				// 1912 = VS2017 update5(VC++15)
-				// 1913 = VS2017 update6(VC++15)
-				// 1914 = VS2017 15.7(VC++15)
-				// 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;
-					msc_low_ver = 0;
-				} 
-				else {
-					vs_ver = msc_ver - 5;
-				}
-			}
+			// \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);
 
-			_snprintf_s(tmpbuf, sizeof(tmpbuf), _TRUNCATE, " %d.%d",
-				vs_ver,
-				msc_low_ver);
-			strncat_s(buf, sizeof(buf), tmpbuf, _TRUNCATE);
-			if (_MSC_FULL_VER % 100000) {
-				_snprintf_s(tmpbuf, sizeof(tmpbuf), _TRUNCATE, " build %d",
-					_MSC_FULL_VER % 100000);
-				strncat_s(buf, sizeof(buf), tmpbuf, _TRUNCATE);
-			}
-#elif defined(_MSC_VER)
-			_snprintf_s(tmpbuf, sizeof(tmpbuf), _TRUNCATE, " %d.%d",
-				(_MSC_VER / 100) - 6,
-				_MSC_VER % 100);
-			strncat_s(buf, sizeof(buf), tmpbuf, _TRUNCATE);
-#endif
-			SendMessage(GetDlgItem(Dialog, IDC_BUILDTOOL), WM_SETTEXT, 0, (LPARAM)buf);
-
 			// \x83r\x83\x8B\x83h\x83^\x83C\x83\x80\x82\xF0\x90ݒ肷\x82\xE9\x81B(2009.3.4 yutaka)
 			_snprintf_s(buf, sizeof(buf), _TRUNCATE, "Build time: %s %s", __DATE__, __TIME__);
-			SendMessage(GetDlgItem(Dialog, IDC_BUILDTIME), WM_SETTEXT, 0, (LPARAM)buf);
+			SetDlgItemTextA(Dialog, IDC_BUILDTIME, buf);
 
 			// static text \x82̃T\x83C\x83Y\x82\xF0\x95ύX (2007.4.16 maya)
 			hwnd = GetDlgItem(Dialog, IDC_AUTHOR_URL);
 			hdc = GetDC(hwnd);
-			SelectObject(hdc, DlgAboutFont);
-			GetDlgItemText(Dialog, IDC_AUTHOR_URL, uimsg, sizeof(uimsg));
+			SelectObject(hdc, (HFONT)SendMessage(Dialog, WM_GETFONT, 0, 0));
+			GetDlgItemTextA(Dialog, IDC_AUTHOR_URL, uimsg, sizeof(uimsg));
 			dwExt = GetTabbedTextExtent(hdc,uimsg,strlen(uimsg),0,NULL);
 			w = LOWORD(dwExt) + 5; // \x95\x9D\x82\xAA\x8E኱\x91\xAB\x82\xE8\x82Ȃ\xA2\x82̂ŕ␳
 			h = HIWORD(dwExt);
@@ -2697,8 +2258,8 @@
 
 			hwnd = GetDlgItem(Dialog, IDC_FORUM_URL);
 			hdc = GetDC(hwnd);
-			SelectObject(hdc, DlgAboutFont);
-			GetDlgItemText(Dialog, IDC_FORUM_URL, uimsg, sizeof(uimsg));
+			SelectObject(hdc, (HFONT)SendMessage(Dialog, WM_GETFONT, 0, 0));
+			GetDlgItemTextA(Dialog, IDC_FORUM_URL, uimsg, sizeof(uimsg));
 			dwExt = GetTabbedTextExtent(hdc,uimsg,strlen(uimsg),0,NULL);
 			w = LOWORD(dwExt) + 5; // \x95\x9D\x82\xAA\x8E኱\x91\xAB\x82\xE8\x82Ȃ\xA2\x82̂ŕ␳
 			h = HIWORD(dwExt);
@@ -2768,6 +2329,8 @@
 			ReleaseDC(hwnd, hdc);
 #endif
 
+			CenterWindow(Dialog, GetParent(Dialog));
+
 			return TRUE;
 
 		case WM_COMMAND:
@@ -2803,9 +2366,6 @@
 					return TRUE;
 			}
 #endif
-			if (DlgAboutFont != NULL) {
-				DeleteObject(DlgAboutFont);
-			}
 			break;
 
 #if defined(EFFECT_ENABLED) || defined(TEXTURE_ENABLED)
@@ -2991,65 +2551,34 @@
 	return (n + 1);  // 1origin
 }
 
-BOOL CALLBACK GenDlg(HWND Dialog, UINT Message, WPARAM wParam, LPARAM lParam)
+static BOOL CALLBACK GenDlg(HWND Dialog, UINT Message, WPARAM wParam, LPARAM lParam)
 {
+	static const DlgTextInfo TextInfos[] = {
+		{ 0, "DLG_GEN_TITLE" },
+		{ IDC_GENPORT_LABEL, "DLG_GEN_PORT" },
+		{ IDC_GENLANGLABEL, "DLG_GEN_LANG" },
+		{ IDC_GENLANGUI_LABEL, "DLG_GEN_LANG_UI" },
+		{ IDOK, "BTN_OK" },
+		{ IDCANCEL, "BTN_CANCEL" },
+		{ IDC_GENHELP, "BTN_HELP" },
+	};
 	static int langui_sel = 1, uilist_count = 0;
 	PTTSet ts;
 	WORD w;
-	char Temp[8];
-	char uimsg[MAX_UIMSG], uimsg2[MAX_UIMSG];
-	LOGFONT logfont;
-	HFONT font;
 
 	switch (Message) {
 		case WM_INITDIALOG:
 			ts = (PTTSet)lParam;
-			SetWindowLong(Dialog, DWL_USER, lParam);
+			SetWindowLongPtr(Dialog, DWLP_USER, lParam);
 
-			font = (HFONT)SendMessage(Dialog, WM_GETFONT, 0, 0);
-			GetObject(font, sizeof(LOGFONT), &logfont);
-			if (get_lang_font("DLG_SYSTEM_FONT", Dialog, &logfont, &DlgGenFont, UILanguageFile)) {
-				SendDlgItemMessage(Dialog, IDC_GENPORT_LABEL, WM_SETFONT, (WPARAM)DlgGenFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_GENPORT, WM_SETFONT, (WPARAM)DlgGenFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_GENLANGLABEL, WM_SETFONT, (WPARAM)DlgGenFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_GENLANG, WM_SETFONT, (WPARAM)DlgGenFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_GENLANGUI_LABEL, WM_SETFONT, (WPARAM)DlgGenFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_GENLANG_UI, WM_SETFONT, (WPARAM)DlgGenFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDOK, WM_SETFONT, (WPARAM)DlgGenFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDCANCEL, WM_SETFONT, (WPARAM)DlgGenFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_GENHELP, WM_SETFONT, (WPARAM)DlgGenFont, MAKELPARAM(TRUE,0));
-			}
-			else {
-				DlgGenFont = NULL;
-			}
-
-			GetWindowText(Dialog, uimsg2, sizeof(uimsg2));
-			get_lang_msg("DLG_GEN_TITLE", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetWindowText(Dialog, uimsg);
-			GetDlgItemText(Dialog, IDC_GENPORT_LABEL, uimsg2, sizeof(uimsg2));
-			get_lang_msg("DLG_GEN_PORT", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDC_GENPORT_LABEL, uimsg);
-			GetDlgItemText(Dialog, IDC_GENLANGLABEL, uimsg2, sizeof(uimsg2));
-			get_lang_msg("DLG_GEN_LANG", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDC_GENLANGLABEL, uimsg);
-			GetDlgItemText(Dialog, IDC_GENLANGUI_LABEL, uimsg2, sizeof(uimsg2));
-			get_lang_msg("DLG_GEN_LANG_UI", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDC_GENLANGUI_LABEL, uimsg);
-			GetDlgItemText(Dialog, IDOK, uimsg2, sizeof(uimsg2));
-			get_lang_msg("BTN_OK", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDOK, uimsg);
-			GetDlgItemText(Dialog, IDCANCEL, uimsg2, sizeof(uimsg2));
-			get_lang_msg("BTN_CANCEL", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDCANCEL, uimsg);
-			GetDlgItemText(Dialog, IDC_GENHELP, uimsg2, sizeof(uimsg2));
-			get_lang_msg("BTN_HELP", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDC_GENHELP, uimsg);
-
-			SendDlgItemMessage(Dialog, IDC_GENPORT, CB_ADDSTRING,
+			SetDlgTexts(Dialog, TextInfos, _countof(TextInfos), UILanguageFile);
+		
+			SendDlgItemMessageA(Dialog, IDC_GENPORT, CB_ADDSTRING,
 			                   0, (LPARAM)"TCP/IP");
 			for (w=1;w<=ts->MaxComPort;w++) {
+				char Temp[8];
 				_snprintf_s(Temp, sizeof(Temp), _TRUNCATE, "COM%d", w);
-				SendDlgItemMessage(Dialog, IDC_GENPORT, CB_ADDSTRING,
+				SendDlgItemMessageA(Dialog, IDC_GENPORT, CB_ADDSTRING,
 				                   0, (LPARAM)Temp);
 			}
 			if (ts->PortType==IdSerial) {
@@ -3078,6 +2607,8 @@
 				EnableWindow(GetDlgItem(Dialog, IDC_GENLANG_UI), FALSE);
 			}
 
+			CenterWindow(Dialog, GetParent(Dialog));
+
 			return TRUE;
 
 		case WM_COMMAND:
@@ -3134,16 +2665,10 @@
 					PostMessage(GetParent(Dialog),WM_USER_CHANGEMENU,0,0);
 
 					EndDialog(Dialog, 1);
-					if (DlgGenFont != NULL) {
-						DeleteObject(DlgGenFont);
-					}
 					return TRUE;
 
 				case IDCANCEL:
 					EndDialog(Dialog, 0);
-					if (DlgGenFont != NULL) {
-						DeleteObject(DlgGenFont);
-					}
 					return TRUE;
 
 				case IDC_GENHELP:
@@ -3158,54 +2683,31 @@
 	return FALSE;
 }
 
-BOOL CALLBACK WinListDlg(HWND Dialog, UINT Message, WPARAM wParam, LPARAM lParam)
+static BOOL CALLBACK WinListDlg(HWND Dialog, UINT Message, WPARAM wParam, LPARAM lParam)
 {
+	static const DlgTextInfo TextInfos[] = {
+		{ 0, "DLG_WINLIST_TITLE" },
+		{ IDC_WINLISTLABEL, "DLG_WINLIST_LABEL" },
+		{ IDOK, "DLG_WINLIST_OPEN" },
+		{ IDCANCEL, "BTN_CANCEL" },
+		{ IDC_WINLISTCLOSE, "DLG_WINLIST_CLOSEWIN" },
+		{ IDC_WINLISTHELP, "BTN_HELP" },
+	};
 	PBOOL Close;
 	int n;
 	HWND Hw;
-	char uimsg[MAX_UIMSG], uimsg2[MAX_UIMSG];
-	LOGFONT logfont;
-	HFONT font;
 
 	switch (Message) {
 		case WM_INITDIALOG:
 			Close = (PBOOL)lParam;
-			SetWindowLong(Dialog, DWL_USER, lParam);
+			SetWindowLongPtr(Dialog, DWLP_USER, lParam);
 
-			font = (HFONT)SendMessage(Dialog, WM_GETFONT, 0, 0);
-			GetObject(font, sizeof(LOGFONT), &logfont);
-			if (get_lang_font("DLG_SYSTEM_FONT", Dialog, &logfont, &DlgWinlistFont, UILanguageFile)) {
-				SendDlgItemMessage(Dialog, IDC_WINLISTLABEL, WM_SETFONT, (WPARAM)DlgWinlistFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_WINLISTLIST, WM_SETFONT, (WPARAM)DlgWinlistFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDOK, WM_SETFONT, (WPARAM)DlgWinlistFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDCANCEL, WM_SETFONT, (WPARAM)DlgWinlistFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_WINLISTCLOSE, WM_SETFONT, (WPARAM)DlgWinlistFont, MAKELPARAM(TRUE,0));
-				SendDlgItemMessage(Dialog, IDC_WINLISTHELP, WM_SETFONT, (WPARAM)DlgWinlistFont, MAKELPARAM(TRUE,0));
-			}
-			else {
-				DlgWinlistFont = NULL;
-			}
+			SetDlgTexts(Dialog, TextInfos, _countof(TextInfos), UILanguageFile);
+		
+			SetWinList(GetParent(Dialog),Dialog,IDC_WINLISTLIST);
 
-			GetWindowText(Dialog, uimsg2, sizeof(uimsg2));
-			get_lang_msg("DLG_WINLIST_TITLE", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetWindowText(Dialog, uimsg);
-			GetDlgItemText(Dialog, IDC_WINLISTLABEL, uimsg2, sizeof(uimsg2));
-			get_lang_msg("DLG_WINLIST_LABEL", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDC_WINLISTLABEL, uimsg);
-			GetDlgItemText(Dialog, IDOK, uimsg2, sizeof(uimsg2));
-			get_lang_msg("DLG_WINLIST_OPEN", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDOK, uimsg);
-			GetDlgItemText(Dialog, IDCANCEL, uimsg2, sizeof(uimsg2));
-			get_lang_msg("BTN_CANCEL", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDCANCEL, uimsg);
-			GetDlgItemText(Dialog, IDC_WINLISTCLOSE, uimsg2, sizeof(uimsg2));
-			get_lang_msg("DLG_WINLIST_CLOSEWIN", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDC_WINLISTCLOSE, uimsg);
-			GetDlgItemText(Dialog, IDC_WINLISTHELP, uimsg2, sizeof(uimsg2));
-			get_lang_msg("BTN_HELP", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			SetDlgItemText(Dialog, IDC_WINLISTHELP, uimsg);
+			CenterWindow(Dialog, GetParent(Dialog));
 
-			SetWinList(GetParent(Dialog),Dialog,IDC_WINLISTLIST);
 			return TRUE;
 
 		case WM_COMMAND:
@@ -3217,16 +2719,10 @@
 						SelectWin(n);
 					}
 					EndDialog(Dialog, 1);
-					if (DlgWinlistFont != NULL) {
-						DeleteObject(DlgWinlistFont);
-					}
 					return TRUE;
 
 				case IDCANCEL:
 					EndDialog(Dialog, 0);
-					if (DlgWinlistFont != NULL) {
-						DeleteObject(DlgWinlistFont);
-					}
 					return TRUE;
 
 				case IDC_WINLISTLIST:
@@ -3250,9 +2746,6 @@
 						SendDlgItemMessage(Dialog,IDC_WINLISTLIST,
 						                   LB_DELETESTRING,n,0);
 						PostMessage(Hw,WM_SYSCOMMAND,SC_CLOSE,0);
-						if (DlgWinlistFont != NULL) {
-							DeleteObject(DlgWinlistFont);
-						}
 					}
 					else {
 						Close = (PBOOL)GetWindowLong(Dialog,DWL_USER);
@@ -3260,9 +2753,6 @@
 							*Close = TRUE;
 						}
 						EndDialog(Dialog, 1);
-						if (DlgWinlistFont != NULL) {
-							DeleteObject(DlgWinlistFont);
-						}
 						return TRUE;
 					}
 					break;
@@ -3274,7 +2764,7 @@
 	return FALSE;
 }
 
-BOOL WINAPI SetupTerminal(HWND WndParent, PTTSet ts)
+BOOL WINAPI _SetupTerminal(HWND WndParent, PTTSet ts)
 {
 	int i;
 
@@ -3299,7 +2789,7 @@
 		                     WndParent, TermDlg, (LPARAM)ts);
 }
 
-BOOL WINAPI SetupWin(HWND WndParent, PTTSet ts)
+BOOL WINAPI _SetupWin(HWND WndParent, PTTSet ts)
 {
 	return
 		(BOOL)DialogBoxParam(hInst,
@@ -3307,7 +2797,7 @@
 		                     WndParent, WinDlg, (LPARAM)ts);
 }
 
-BOOL WINAPI SetupKeyboard(HWND WndParent, PTTSet ts)
+BOOL WINAPI _SetupKeyboard(HWND WndParent, PTTSet ts)
 {
 	return
 		(BOOL)DialogBoxParam(hInst,
@@ -3315,7 +2805,7 @@
 		                     WndParent, KeybDlg, (LPARAM)ts);
 }
 
-BOOL WINAPI SetupSerialPort(HWND WndParent, PTTSet ts)
+BOOL WINAPI _SetupSerialPort(HWND WndParent, PTTSet ts)
 {
 	return
 		(BOOL)DialogBoxParam(hInst,
@@ -3323,7 +2813,7 @@
 		                     WndParent, SerialDlg, (LPARAM)ts);
 }
 
-BOOL WINAPI SetupTCPIP(HWND WndParent, PTTSet ts)
+BOOL WINAPI _SetupTCPIP(HWND WndParent, PTTSet ts)
 {
 	return
 		(BOOL)DialogBoxParam(hInst,
@@ -3331,7 +2821,7 @@
 		                     WndParent, TCPIPDlg, (LPARAM)ts);
 }
 
-BOOL WINAPI GetHostName(HWND WndParent, PGetHNRec GetHNRec)
+BOOL WINAPI _GetHostName(HWND WndParent, PGetHNRec GetHNRec)
 {
 	return
 		(BOOL)DialogBoxParam(hInst,
@@ -3339,7 +2829,7 @@
 		                     WndParent, HostDlg, (LPARAM)GetHNRec);
 }
 
-BOOL WINAPI ChangeDirectory(HWND WndParent, PCHAR CurDir)
+BOOL WINAPI _ChangeDirectory(HWND WndParent, PCHAR CurDir)
 {
 	return
 		(BOOL)DialogBoxParam(hInst,
@@ -3347,7 +2837,7 @@
 		                     WndParent, DirDlg, (LPARAM)CurDir);
 }
 
-BOOL WINAPI AboutDialog(HWND WndParent)
+BOOL WINAPI _AboutDialog(HWND WndParent)
 {
 	return
 		(BOOL)DialogBox(hInst,
@@ -3373,6 +2863,8 @@
 
 			SetFocus(GetDlgItem(Dialog,cmb1));
 
+			CenterWindow(Dialog, GetParent(Dialog));
+
 			break;
 		}
 #if 0
@@ -3400,7 +2892,7 @@
 #ifndef CF_INACTIVEFONTS
 #define CF_INACTIVEFONTS 0x02000000L
 #endif
-BOOL WINAPI ChooseFontDlg(HWND WndParent, LPLOGFONT LogFont, PTTSet ts)
+BOOL WINAPI _ChooseFontDlg(HWND WndParent, LPLOGFONTA LogFont, PTTSet ts)
 {
 	CHOOSEFONT cf;
 	BOOL Ok;
@@ -3423,7 +2915,7 @@
 	return Ok;
 }
 
-BOOL WINAPI SetupGeneral(HWND WndParent, PTTSet ts)
+BOOL WINAPI _SetupGeneral(HWND WndParent, PTTSet ts)
 {
 	return
 		(BOOL)DialogBoxParam(hInst,
@@ -3431,7 +2923,7 @@
 		                     WndParent, (DLGPROC)&GenDlg, (LPARAM)ts);
 }
 
-BOOL WINAPI WindowWindow(HWND WndParent, PBOOL Close)
+BOOL WINAPI _WindowWindow(HWND WndParent, PBOOL Close)
 {
 	*Close = FALSE;
 	return
@@ -3441,11 +2933,13 @@
 		                     (DLGPROC)&WinListDlg, (LPARAM)Close);
 }
 
-void WINAPI TTDLGSetUILanguageFile(char *file)
+BOOL WINAPI _TTDLGSetUILanguageFile(char *file)
 {
 	strncpy_s(UILanguageFile, sizeof(UILanguageFile), file, _TRUNCATE);
+	return TRUE;
 }
 
+#if 0
 BOOL WINAPI DllMain(HANDLE hInstance,
                     ULONG ul_reason_for_call,
                     LPVOID lpReserved)
@@ -3468,3 +2962,4 @@
 	}
 	return TRUE;
 }
+#endif

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

Deleted: branches/ssh_auth_dialog/teraterm/ttpdlg/ttpdlg-version.rc
===================================================================
--- branches/ssh_auth_dialog/teraterm/ttpdlg/ttpdlg-version.rc	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/teraterm/ttpdlg/ttpdlg-version.rc	2019-04-24 14:08:16 UTC (rev 7613)
@@ -1,39 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version
-//
-
-#include "tt-version.h"
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION TT_VERSION_MAJOR,TT_VERSION_MINOR,0,0
- PRODUCTVERSION TT_VERSION_MAJOR,TT_VERSION_MINOR,0,0
- FILEFLAGSMASK 0x3fL
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x4L
- FILETYPE 0x2L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904b0"
-        BEGIN
-            VALUE "CompanyName", "T. Teranishi, TeraTerm Project"
-            VALUE "FileDescription", "Tera Term Dialog Routines"
-            VALUE "FileVersion", TT_RES_VERSION_STR
-            VALUE "InternalName", "TTPDLG"
-            VALUE "LegalCopyright", "Copyright (C) 1994-1998 T. Teranishi, (C) 2004-2019 TeraTerm Project"
-            VALUE "OriginalFilename", "TTPDLG.dll"
-            VALUE "ProductName", "Tera Term"
-            VALUE "ProductVersion", TT_RES_VERSION_STR
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1200
-    END
-END

Deleted: branches/ssh_auth_dialog/teraterm/ttpdlg/ttpdlg.def
===================================================================
--- branches/ssh_auth_dialog/teraterm/ttpdlg/ttpdlg.def	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/teraterm/ttpdlg/ttpdlg.def	2019-04-24 14:08:16 UTC (rev 7613)
@@ -1,14 +0,0 @@
-EXPORTS
-  SetupTerminal @1
-  SetupWin @2
-  SetupKeyboard @3
-  SetupSerialPort @4
-  SetupTCPIP @5
-  GetHostName @6
-  ChangeDirectory @7
-  AboutDialog @8
-  ChooseFontDlg @9
-  SetupGeneral @10
-  WindowWindow @11
-
-  TTDLGSetUILanguageFile @12

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

Modified: branches/ssh_auth_dialog/teraterm/ttpdlg/ttpdlg.rc
===================================================================
--- branches/ssh_auth_dialog/teraterm/ttpdlg/ttpdlg.rc	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/teraterm/ttpdlg/ttpdlg.rc	2019-04-24 14:08:16 UTC (rev 7613)
@@ -42,7 +42,6 @@
 
 3 TEXTINCLUDE 
 BEGIN
-    "#include ""ttpdlg-version.rc""\r\n"
     "\0"
 END
 
@@ -111,10 +110,10 @@
     CONTROL         "A&uto switch (VT<->TEK)",IDC_TERMAUTOSWITCH,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,123,80,110,12
     GROUPBOX        "&Kanji (receive)",IDC_TERMKANJILABEL,7,96,71,40
     COMBOBOX        IDC_TERMKANJI,11,107,39,58,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
-    CONTROL         "Hal&f-width kana",IDC_TERMKANA,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,120,67,12
+    CONTROL         "Hal&f-width kana",IDC_TERMKANA,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,120,65,12
     GROUPBOX        "Kan&ji (transmit)",IDC_TERMKANJISENDLABEL,82,96,158,40
     COMBOBOX        IDC_TERMKANJISEND,86,107,40,58,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
-    CONTROL         "Half-wi&dth kana",IDC_TERMKANASEND,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,85,120,68,12
+    CONTROL         "Half-wi&dth kana",IDC_TERMKANASEND,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,86,120,68,12
     CONTROL         "Kanji-i&n:",IDC_TERMKINTEXT,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,150,109,48,11
     COMBOBOX        IDC_TERMKIN,203,107,32,58,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
     CONTROL         "Kanji-&out:",IDC_TERMKOUTTEXT,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,150,122,48,11
@@ -218,29 +217,29 @@
     PUSHBUTTON      "&Help",IDC_DIRHELP,115,34,36,14
 END
 
-IDD_ABOUTDLG DIALOGEX 20, 20, 187, 118
+IDD_ABOUTDLG DIALOGEX 20, 20, 187, 124
 STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "About Tera Term"
 FONT 14, "System", 0, 0, 0x0
 BEGIN
-    ICON            "",IDC_TT_ICON,6,6,20,20
-    CONTROL         "Tera Term",IDC_TT_PRO,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,38,1,78,8
+    ICON            "",IDC_TT_ICON,6,9,20,20
+    CONTROL         "Tera Term",IDC_TT_PRO,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,38,4,78,8
+    LTEXT           "Version",IDC_TT_VERSION,38,13,101,8
+    LTEXT           "Includes:",IDC_INLUCDE_LABEL,38,29,31,8
+    LTEXT           "Oniguruma: ",IDC_ONIGURUMA_LABEL,38,38,114,8
     CONTROL         "Tera Term Pro version 2.3 + IPv6 0.81",IDC_TT23_LABEL,
-                    "Static",SS_LEFTNOWORDWRAP | WS_GROUP,38,43,137,8
-    CONTROL         "Mar 10, 1998 T. Teranishi",IDC_TT23DATE_LABEL,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,38,51,90,8
+                    "Static",SS_LEFTNOWORDWRAP | WS_GROUP,38,47,137,8
+    CONTROL         "Mar 10, 1998 T. Teranishi",IDC_TT23DATE_LABEL,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,38,56,90,8
     CONTROL         "Copyright (C) 1994-1998 T. Teranishi",IDC_TERANISHI_LABEL,
-                    "Static",SS_LEFTNOWORDWRAP | WS_GROUP,38,59,134,8
-    DEFPUSHBUTTON   "OK",IDOK,145,6,32,16,WS_GROUP
-    CONTROL         "All Rights Reserved.",IDC_RIGHTS_LABEL,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,38,75,76,8
+                    "Static",SS_LEFTNOWORDWRAP | WS_GROUP,38,65,134,8
     CONTROL         "(C) 2004-2019 TeraTerm Project",IDC_PROJECT_LABEL,
-                    "Static",SS_LEFTNOWORDWRAP | WS_GROUP,38,67,122,9
-    LTEXT           "Includes:",IDC_INLUCDE_LABEL,38,26,31,8
-    LTEXT           "Version",IDC_TT_VERSION,38,10,101,8
-    RTEXT           "Author:",IDC_AUTHOR_LABEL,5,106,28,8
-    LTEXT           "https://ttssh2.osdn.jp/",IDC_AUTHOR_URL,36,106,128,8,SS_NOTIFY | WS_TABSTOP
-    LTEXT           "Oniguruma: ",IDC_ONIGURUMA_LABEL,38,35,114,8
-    LTEXT           "Built using Microsoft Visual C++",IDC_BUILDTOOL,7,87,172,10
-    LTEXT           "Build time: ",IDC_BUILDTIME,7,97,165,8
+                    "Static",SS_LEFTNOWORDWRAP | WS_GROUP,38,74,122,8
+    CONTROL         "All Rights Reserved.",IDC_RIGHTS_LABEL,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,38,83,76,8
+    LTEXT           "Built using Microsoft Visual C++",IDC_BUILDTOOL,7,95,172,8
+    LTEXT           "Build time: ",IDC_BUILDTIME,7,103,165,8
+    LTEXT           "Author:",IDC_AUTHOR_LABEL,7,112,28,8
+    LTEXT           "https://ttssh2.osdn.jp/",IDC_AUTHOR_URL,36,112,128,8,SS_NOTIFY | WS_TABSTOP
+    DEFPUSHBUTTON   "OK",IDOK,145,9,32,14,WS_GROUP
 END
 
 IDD_GENDLG DIALOGEX 20, 20, 162, 80
@@ -298,9 +297,9 @@
     COMBOBOX        IDC_KEYBKEYB,57,47,44,58,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | NOT WS_VISIBLE | WS_VSCROLL | WS_TABSTOP
     CONTROL         "&Meta key:",IDC_KEYBMETATEXT,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,12,63,44,9
     COMBOBOX        IDC_KEYBMETA,57,61,44,58,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
-    GROUPBOX        "Disabled mode:",IDC_KEYBDISABLE,10,74,130,35
-    CONTROL         "&Application Keypad",IDC_KEYBAPPKEY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,20,83,115,12
-    CONTROL         "Application &Cursor",IDC_KEYBAPPCUR,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,20,96,115,12
+    GROUPBOX        "Disabled mode:",IDC_KEYBDISABLE,10,76,130,35
+    CONTROL         "&Application Keypad",IDC_KEYBAPPKEY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,20,85,115,12
+    CONTROL         "Application &Cursor",IDC_KEYBAPPCUR,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,20,98,115,12
     DEFPUSHBUTTON   "OK",IDOK,107,7,40,14,WS_GROUP
     PUSHBUTTON      "Cancel",IDCANCEL,107,26,40,14
     PUSHBUTTON      "&Help",IDC_KEYBHELP,107,55,40,14
@@ -413,7 +412,6 @@
     IDD_ABOUTDLG, DIALOG
     BEGIN
         RIGHTMARGIN, 186
-        BOTTOMMARGIN, 125
     END
 
     IDD_GENDLG, DIALOG
@@ -436,27 +434,7 @@
 END
 #endif    // APSTUDIO_INVOKED
 
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Icon
-//
-
-// Icon with lowest ID value placed first to ensure application icon
-// remains consistent on all systems.
-IDI_TTERM               ICON                    "..\\common\\teraterm.ico"
 #endif    // \x89p\x8C\xEA (\x95č\x91) resources
 /////////////////////////////////////////////////////////////////////////////
 
 
-
-#ifndef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 3 resource.
-//
-#include "ttpdlg-version.rc"
-
-/////////////////////////////////////////////////////////////////////////////
-#endif    // not APSTUDIO_INVOKED
-

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

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

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

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

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

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

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

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

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

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

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

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

Modified: branches/ssh_auth_dialog/teraterm/ttpfile/quickvan.c
===================================================================
--- branches/ssh_auth_dialog/teraterm/ttpfile/quickvan.c	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/teraterm/ttpfile/quickvan.c	2019-04-24 14:08:16 UTC (rev 7613)
@@ -34,8 +34,8 @@
 #include <stdio.h>
 #include <string.h>
 #include <time.h>
-#include <sys\utime.h>
-#include <sys\stat.h>
+#include <sys/utime.h>
+#include <sys/stat.h>
 
 #include "tt_res.h"
 #include "dlglib.h"

Modified: branches/ssh_auth_dialog/teraterm/ttpfile/ttfile.c
===================================================================
--- branches/ssh_auth_dialog/teraterm/ttpfile/ttfile.c	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/teraterm/ttpfile/ttfile.c	2019-04-24 14:08:16 UTC (rev 7613)
@@ -238,6 +238,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)
 {
@@ -374,6 +382,8 @@
 			DisableDlgItem(Dialog, IDC_TIMESTAMPTYPE, IDC_TIMESTAMPTYPE);
 		}
 
+		CenterCommonDialog(Dialog);
+
 		return TRUE;
 
 	case WM_COMMAND: // for old style dialog
@@ -611,6 +621,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)) {
@@ -1026,6 +1039,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)) {

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

Modified: branches/ssh_auth_dialog/teraterm/ttpfile/ttpfile.v10.vcxproj
===================================================================
--- branches/ssh_auth_dialog/teraterm/ttpfile/ttpfile.v10.vcxproj	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/teraterm/ttpfile/ttpfile.v10.vcxproj	2019-04-24 14:08:16 UTC (rev 7613)
@@ -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">

Modified: branches/ssh_auth_dialog/teraterm/ttpfile/ttpfile.v11.vcxproj
===================================================================
--- branches/ssh_auth_dialog/teraterm/ttpfile/ttpfile.v11.vcxproj	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/teraterm/ttpfile/ttpfile.v11.vcxproj	2019-04-24 14:08:16 UTC (rev 7613)
@@ -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">

Modified: branches/ssh_auth_dialog/teraterm/ttpfile/ttpfile.v12.vcxproj
===================================================================
--- branches/ssh_auth_dialog/teraterm/ttpfile/ttpfile.v12.vcxproj	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/teraterm/ttpfile/ttpfile.v12.vcxproj	2019-04-24 14:08:16 UTC (rev 7613)
@@ -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">

Modified: branches/ssh_auth_dialog/teraterm/ttpfile/ttpfile.v14.vcxproj
===================================================================
--- branches/ssh_auth_dialog/teraterm/ttpfile/ttpfile.v14.vcxproj	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/teraterm/ttpfile/ttpfile.v14.vcxproj	2019-04-24 14:08:16 UTC (rev 7613)
@@ -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">

Modified: branches/ssh_auth_dialog/teraterm/ttpfile/ttpfile.v15.vcxproj
===================================================================
--- branches/ssh_auth_dialog/teraterm/ttpfile/ttpfile.v15.vcxproj	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/teraterm/ttpfile/ttpfile.v15.vcxproj	2019-04-24 14:08:16 UTC (rev 7613)
@@ -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">
@@ -128,6 +128,8 @@
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="..\common\dlglib.c" />
+    <ClCompile Include="..\common\dlglib_cpp.cpp" />
+    <ClCompile Include="..\common\dlglib_tmpl.cpp" />
     <ClCompile Include="..\common\ttlib.c" />
     <ClCompile Include="..\common\win16api.c" />
     <ClCompile Include="bplus.c" />
@@ -170,4 +172,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>

Modified: branches/ssh_auth_dialog/teraterm/ttpfile/ttpfile.v15.vcxproj.filters
===================================================================
--- branches/ssh_auth_dialog/teraterm/ttpfile/ttpfile.v15.vcxproj.filters	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/teraterm/ttpfile/ttpfile.v15.vcxproj.filters	2019-04-24 14:08:16 UTC (rev 7613)
@@ -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">

Copied: branches/ssh_auth_dialog/teraterm/ttpfile/ttpfile.v16.vcxproj (from rev 7520, branches/ssh_auth_dialog/teraterm/ttpfile/ttpfile.v15.vcxproj)
===================================================================
--- branches/ssh_auth_dialog/teraterm/ttpfile/ttpfile.v16.vcxproj	                        (rev 0)
+++ branches/ssh_auth_dialog/teraterm/ttpfile/ttpfile.v16.vcxproj	2019-04-24 14:08:16 UTC (rev 7613)
@@ -0,0 +1,175 @@
+<?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>
+      <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>
+      <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="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.v15.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/ssh_auth_dialog/teraterm/ttpfile/ttpfile.v16.vcxproj.filters (from rev 7520, branches/ssh_auth_dialog/teraterm/ttpfile/ttpfile.v15.vcxproj.filters)
===================================================================
--- branches/ssh_auth_dialog/teraterm/ttpfile/ttpfile.v16.vcxproj.filters	                        (rev 0)
+++ branches/ssh_auth_dialog/teraterm/ttpfile/ttpfile.v16.vcxproj.filters	2019-04-24 14:08:16 UTC (rev 7613)
@@ -0,0 +1,101 @@
+<?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="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/ssh_auth_dialog/teraterm/ttpfile/ttpfile.vcproj
===================================================================
--- branches/ssh_auth_dialog/teraterm/ttpfile/ttpfile.vcproj	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/teraterm/ttpfile/ttpfile.vcproj	2019-04-24 14:08:16 UTC (rev 7613)
@@ -71,7 +71,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="ttpcmn.lib"
+				AdditionalDependencies="User32.lib gdi32.lib SHELL32.lib ole32.lib comdlg32.lib ttpcmn.lib"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="$(OutDir)"
@@ -161,7 +161,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="ttpcmn.lib"
+				AdditionalDependencies="User32.lib gdi32.lib SHELL32.lib ole32.lib comdlg32.lib ttpcmn.lib"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="$(OutDir)"
@@ -233,6 +233,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\common\win16api.c"
+				>
+			</File>
+			<File
 				RelativePath="xmodem.c"
 				>
 			</File>
@@ -244,10 +248,6 @@
 				RelativePath="zmodem.c"
 				>
 			</File>
-			<File
-				RelativePath="..\common\win16api.c"
-				>
-			</File>
 		</Filter>
 		<Filter
 			Name="Header Files"

Modified: branches/ssh_auth_dialog/teraterm/ttpmacro/CMakeLists.txt
===================================================================
--- branches/ssh_auth_dialog/teraterm/ttpmacro/CMakeLists.txt	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/teraterm/ttpmacro/CMakeLists.txt	2019-04-24 14:08:16 UTC (rev 7613)
@@ -19,11 +19,21 @@
   ../common/i18n.h
   ../common/ttlib.c
   ../common/ttlib.h
+  ../common/tmfc.cpp
+  ../common/tmfc.h
+  ../common/tmfc_frame.cpp
+  ../common/dlglib.h
+  ../common/dlglib.c
+  ../common/dlglib_tmpl.cpp
+  ../common/dlglib_cpp.cpp
   ../common/compat_w95.h
+  ../common/compat_win.h
+  ../common/compat_win.cpp
   ../common/win16api.h
   ../common/win16api.c
   ../common/codeconv.h
   ../common/codeconv.cpp
+  ../common/dllutil.cpp
   )
 
 source_group(
@@ -44,7 +54,6 @@
   msgdlg.h
   statdlg.cpp
   statdlg.h
-  stdafx.h
   ttl.c
   ttl.h
   ttm_res.h
@@ -88,11 +97,7 @@
   ${SFMT_LIBRARY_DIRS}
   )
 
-set(CMAKE_MFC_FLAG 1)
-
 if (MSVC)
-  set(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} /NODEFAULTLIB:nafxcw.lib /NODEFAULTLIB:LIBCMT.lib")
-  set(CMAKE_EXE_LINKER_FLAGS_DEBUG "${CMAKE_EXE_LINKER_FLAGS_DEBUG} /NODEFAULTLIB:nafxcwd.lib /NODEFAULTLIB:LIBCMTD.lib")
   set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /DELAYLOAD:iphlpapi.dll /DELAYLOAD:user32.dll")
 endif()
 
@@ -104,14 +109,12 @@
 target_link_libraries(
   ttpmacro
   ttpcmn
-  optimized nafxcw.lib
-  debug nafxcwd.lib
-  optimized LIBCMT.lib
-  debug LIBCMTD.lib
-  optimized onig.lib
-  debug onigd.lib
-  optimized sfmt.lib
-  debug sfmtd.lib
+#  optimized LIBCMT.lib
+#  debug LIBCMTD.lib
+  optimized onig
+  debug onigd
+  optimized sfmt
+  debug sfmtd
   #
   iphlpapi
   delayimp

Modified: branches/ssh_auth_dialog/teraterm/ttpmacro/ListDlg.cpp
===================================================================
--- branches/ssh_auth_dialog/teraterm/ttpmacro/ListDlg.cpp	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/teraterm/ttpmacro/ListDlg.cpp	2019-04-24 14:08:16 UTC (rev 7613)
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2017 TeraTerm Project
+ * Copyright (C) 2013-2019 TeraTerm Project
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -29,23 +29,21 @@
 // ListDlg.cpp : \x8E\xC0\x91\x95\x83t\x83@\x83C\x83\x8B
 //
 
-#include "stdafx.h"
+#include "tmfc.h"
 #include "teraterm.h"
 #include "ttlib.h"
 #include "ttm_res.h"
 #include "ttmlib.h"
 #include "tttypes.h"
+#include "dlglib.h"
+#include "ttmdlg.h"
+#include "ttmacro.h"
 
-#include "stdafx.h"
 #include "ListDlg.h"
 
-
 // CListDlg \x83_\x83C\x83A\x83\x8D\x83O
 
-IMPLEMENT_DYNAMIC(CListDlg, CDialog)
-
 CListDlg::CListDlg(PCHAR Text, PCHAR Caption, CHAR **Lists, int Selected, int x, int y)
-	: CDialog(CListDlg::IDD)
 {
 	m_Text = Text;
 	m_Caption = Caption;
@@ -53,76 +51,40 @@
 	m_Selected = Selected;
 	PosX = x;
 	PosY = y;
-	DlgFont = NULL;
 }
 
-CListDlg::~CListDlg()
+INT_PTR CListDlg::DoModal()
 {
+	HINSTANCE hInst = GetInstance();
+	HWND hWndParent = GetHWND();
+	return TTCDialog::DoModal(hInst, hWndParent, IDD);
 }
 
-void CListDlg::DoDataExchange(CDataExchange* pDX)
-{
-	CDialog::DoDataExchange(pDX);
-	DDX_Control(pDX, IDC_LISTBOX, m_xcList);
-}
-
-
-BEGIN_MESSAGE_MAP(CListDlg, CDialog)
-	ON_BN_CLICKED(IDOK, &CListDlg::OnBnClickedOk)
-	ON_BN_CLICKED(IDCANCEL, &CListDlg::OnBnClickedCancel)
-END_MESSAGE_MAP()
-
-
-// CListDlg \x83\x81\x83b\x83Z\x81[\x83W \x83n\x83\x93\x83h\x83\x89
-
-void CListDlg::OnBnClickedOk()
-{
-	// TODO: \x82\xB1\x82\xB1\x82ɃR\x83\x93\x83g\x83\x8D\x81[\x83\x8B\x92ʒm\x83n\x83\x93\x83h\x83\x89 \x83R\x81[\x83h\x82\xF0\x92ǉ\xC1\x82\xB5\x82܂\xB7\x81B
-	m_SelectItem = m_xcList.GetCurSel();
-	OnOK();
-}
-
 BOOL CListDlg::OnInitDialog()
 {
+	static const DlgTextInfo TextInfos[] = {
+		{ IDOK, "BTN_YES" },
+		{ IDCANCEL, "BTN_CANCEL" },
+	};
 	char **p;
-	char uimsg[MAX_UIMSG], uimsg2[MAX_UIMSG];
-	LOGFONT logfont;
-	HFONT font, tmpfont;
 	int ListMaxWidth = 0;
-	int ListWidth;
 	int ListCount = 0;
-	CDC *pDC;
-	CFont *pOldFont;
+	HDC DC;
 	RECT R;
-	HDC TmpDC;
 	HWND HList, HOk;
 
-	CDialog::OnInitDialog();
+	SetDlgTexts(m_hWnd, TextInfos, _countof(TextInfos), UILanguageFile);
 
-	// TODO:  \x82\xB1\x82\xB1\x82ɏ\x89\x8A\xFA\x89\xBB\x82\xF0\x92ǉ\xC1\x82\xB5\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2
-	font = (HFONT)SendMessage(WM_GETFONT, 0, 0);
-	GetObject(font, sizeof(LOGFONT), &logfont);
-	if (get_lang_font("DLG_SYSTEM_FONT", m_hWnd, &logfont, &DlgFont, UILanguageFile)) {
-		SendDlgItemMessage(IDC_LISTBOX, WM_SETFONT, (WPARAM)DlgFont, MAKELPARAM(TRUE,0));
-		SendDlgItemMessage(IDC_STATIC, WM_SETFONT, (WPARAM)DlgFont, MAKELPARAM(TRUE,0));
-		SendDlgItemMessage(IDOK, WM_SETFONT, (WPARAM)DlgFont, MAKELPARAM(TRUE,0));
-		SendDlgItemMessage(IDCANCEL, WM_SETFONT, (WPARAM)DlgFont, MAKELPARAM(TRUE,0));
-	}
+	HList = ::GetDlgItem(m_hWnd, IDC_LISTBOX);
+	DC = ::GetDC(HList);	// \x83\x8A\x83X\x83g\x83{\x83b\x83N\x83X\x82\xF0\x89\xA1\x83X\x83N\x83\x8D\x81[\x83\x8B\x82ł\xAB\x82\xE9\x82悤\x82ɍő啝\x82\xF0\x8E擾
 
-	GetDlgItemText(IDOK, uimsg2, sizeof(uimsg2));
-	get_lang_msg("BTN_OK", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-	SetDlgItemText(IDOK, uimsg);
-	GetDlgItemText(IDCANCEL, uimsg2, sizeof(uimsg2));
-	get_lang_msg("BTN_CANCEL", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-	SetDlgItemText(IDCANCEL, uimsg);
-
-	pDC = m_xcList.GetDC(); // \x83\x8A\x83X\x83g\x83{\x83b\x83N\x83X\x82\xF0\x89\xA1\x83X\x83N\x83\x8D\x81[\x83\x8B\x82ł\xAB\x82\xE9\x82悤\x82ɍő啝\x82\xF0\x8E擾
-	pOldFont = pDC->SelectObject(m_xcList.GetFont());
-
 	p = m_Lists;
 	while (*p) {
-		m_xcList.InsertString(-1, _T(*p));
-		ListWidth = pDC->GetTextExtent(*p).cx;
+		SIZE size;
+		int ListWidth;
+		SendDlgItemMessage(IDC_LISTBOX, LB_ADDSTRING, 0, (LPARAM)(*p));
+		GetTextExtentPoint32(DC, *p, strlen(*p), &size);
+		ListWidth = size.cx;
 		if (ListWidth > ListMaxWidth) {
 			ListMaxWidth = ListWidth;
 		}
@@ -129,35 +91,23 @@
 		ListCount++;
 		p++;
 	}
-	UpdateData(FALSE);
 
-	m_xcList.SetHorizontalExtent(ListMaxWidth + 5);
-	pDC->SelectObject(pOldFont);
-	ReleaseDC(pDC);
+	SendDlgItemMessage(IDC_LISTBOX, LB_SETHORIZONTALEXTENT, (ListMaxWidth + 5), 0);
+	::ReleaseDC(HList, DC);
 
 	if (m_Selected < 0 || m_Selected >= ListCount) {
 		m_Selected = 0;
 	}
-	m_xcList.SetCurSel(m_Selected);
+	SetCurSel(IDC_LISTBOX, m_Selected);
 
 	// \x96{\x95\xB6\x82ƃ^\x83C\x83g\x83\x8B
-	SetDlgItemText(IDC_STATIC, m_Text);
+	SetDlgItemText(IDC_LISTTEXT, m_Text);
 	SetWindowText(m_Caption);
 
-
-	TmpDC = ::GetDC(GetDlgItem(IDC_STATIC)->GetSafeHwnd());
-	if (DlgFont) {
-		tmpfont = (HFONT)SelectObject(TmpDC, DlgFont);
-	}
-	CalcTextExtent(TmpDC,m_Text,&s);
-	if (DlgFont && tmpfont != NULL) {
-		SelectObject(TmpDC, tmpfont);
-	}
-	::ReleaseDC(GetDlgItem(IDC_STATIC)->GetSafeHwnd(),TmpDC);
+	CalcTextExtent(GetDlgItem(IDC_LISTTEXT), NULL, m_Text,&s);
 	TW = s.cx + s.cx/10;
 	TH = s.cy;
 
-	HList = ::GetDlgItem(GetSafeHwnd(), IDC_LISTBOX);
 	::GetWindowRect(HList,&R);
 	LW = R.right-R.left;
 	LH = R.bottom-R.top;
@@ -172,19 +122,33 @@
 	WH = R.bottom-R.top;
 
 	Relocation(TRUE, WW);
+	BringupWindow(m_hWnd);
 
-	BringupWindow(this->m_hWnd);
+	return TRUE;
+}
 
-	return TRUE;  // return TRUE unless you set the focus to a control
-	// \x97\xE1\x8AO : OCX \x83v\x83\x8D\x83p\x83e\x83B \x83y\x81[\x83W\x82͕K\x82\xB8 FALSE \x82\xF0\x95Ԃ\xB5\x82܂\xB7\x81B
+BOOL CListDlg::OnOK()
+{
+	m_SelectItem = GetCurSel(IDC_LISTBOX);
+	return TTCDialog::OnOK();
 }
 
-void CListDlg::OnBnClickedCancel()
+BOOL CListDlg::OnCancel()
 {
-	// TODO: \x82\xB1\x82\xB1\x82ɃR\x83\x93\x83g\x83\x8D\x81[\x83\x8B\x92ʒm\x83n\x83\x93\x83h\x83\x89 \x83R\x81[\x83h\x82\xF0\x92ǉ\xC1\x82\xB5\x82܂\xB7\x81B
-	OnCancel();
+	return TTCDialog::OnCancel();
 }
 
+//int MessageBoxHaltScript(HWND hWnd);
+
+BOOL CListDlg::OnClose()
+{
+	int ret = MessageBoxHaltScript(m_hWnd);
+	if (ret == IDYES) {
+		EndDialog(IDCLOSE);
+	}
+	return TRUE;
+}
+
 void CListDlg::Relocation(BOOL is_init, int new_WW)
 {
 	RECT R;
@@ -192,10 +156,10 @@
 	HWND HText, HOk, HCancel, HList;
 	int CW, CH;
 
-	GetClientRect(&R);
+	::GetClientRect(m_hWnd, &R);
 	CW = R.right-R.left;
 	CH = R.bottom-R.top;
-
+#define CONTROL_GAP_W	14
 	// \x8F\x89\x89\xF1\x82̂\xDD
 	if (is_init) {
 		// \x83e\x83L\x83X\x83g\x83R\x83\x93\x83g\x83\x8D\x81[\x83\x8B\x83T\x83C\x83Y\x82\xF0\x95␳
@@ -207,8 +171,8 @@
 		WH = TH + LH + (int)(BH*1.5) + (WH - CH);
 		init_WW = WW;
 		// \x83\x8A\x83X\x83g\x83{\x83b\x83N\x83X\x83T\x83C\x83Y\x82̌v\x8EZ
-		if (LW < WW - BW - 14*3) {
-			LW = WW - BW - 14*3;
+		if (LW < CW - BW - CONTROL_GAP_W * 3) {
+			LW = CW - BW - CONTROL_GAP_W * 3;
 		}
 	}
 	else {
@@ -216,24 +180,25 @@
 		WW = new_WW;
 	}
 
-	HText = ::GetDlgItem(GetSafeHwnd(), IDC_STATIC);
+	HText = ::GetDlgItem(GetSafeHwnd(), IDC_LISTTEXT);
 	HOk = ::GetDlgItem(GetSafeHwnd(), IDOK);
 	HCancel = ::GetDlgItem(GetSafeHwnd(), IDCANCEL);
 	HList = ::GetDlgItem(GetSafeHwnd(), IDC_LISTBOX);
 
 	::MoveWindow(HText,(TW-s.cx)/2,LH+BH,TW,TH,TRUE);
-	::MoveWindow(HList,14,BH/2,LW,LH,TRUE);
-	::MoveWindow(HOk,14+14+LW,BH/2,BW,BH,TRUE);
-	::MoveWindow(HCancel,14+14+LW,BH*2,BW,BH,TRUE);
+	::MoveWindow(HList,CONTROL_GAP_W,BH/2,LW,LH,TRUE);
+	::MoveWindow(HOk,CONTROL_GAP_W+CONTROL_GAP_W+LW,BH/2,BW,BH,TRUE);
+	::MoveWindow(HCancel,CONTROL_GAP_W+CONTROL_GAP_W+LW,BH*2,BW,BH,TRUE);
 
 	if (PosX<=GetMonitorLeftmost(PosX, PosY)-100) {
-		GetWindowRect(&R);
+		::GetWindowRect(m_hWnd, &R);
 		TmpDC = ::GetDC(GetSafeHwnd());
 		PosX = (GetDeviceCaps(TmpDC,HORZRES)-R.right+R.left) / 2;
 		PosY = (GetDeviceCaps(TmpDC,VERTRES)-R.bottom+R.top) / 2;
 		::ReleaseDC(GetSafeHwnd(),TmpDC);
 	}
-	SetWindowPos(&wndTop,PosX,PosY,WW,WH,0);
+	::SetWindowPos(m_hWnd, HWND_TOP,PosX,PosY,WW,WH,0);
 
-	InvalidateRect(NULL);
+	::InvalidateRect(m_hWnd, NULL, TRUE);
 }
+

Modified: branches/ssh_auth_dialog/teraterm/ttpmacro/ListDlg.h
===================================================================
--- branches/ssh_auth_dialog/teraterm/ttpmacro/ListDlg.h	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/teraterm/ttpmacro/ListDlg.h	2019-04-24 14:08:16 UTC (rev 7613)
@@ -26,42 +26,28 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #pragma once
-#include "afxwin.h"
 
-
 // CListDlg \x83_\x83C\x83A\x83\x8D\x83O
-
-class CListDlg : public CDialog
+class CListDlg : public TTCDialog
 {
-	DECLARE_DYNAMIC(CListDlg)
-
 public:
 	CListDlg(PCHAR Text, PCHAR Caption, CHAR **Lists, int Selected, int x, int y);
-	virtual ~CListDlg();
+	INT_PTR DoModal();
+	int m_SelectItem;
 
-// \x83_\x83C\x83A\x83\x8D\x83O \x83f\x81[\x83^
+private:
 	enum { IDD = IDD_LISTDLG };
-
-protected:
 	PCHAR m_Text;
 	PCHAR m_Caption;
 	CHAR **m_Lists;
 	int m_Selected;
-	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV \x83T\x83|\x81[\x83g
 	int PosX, PosY, init_WW, WW, WH, TW, TH, BH, BW, LW, LH;
 	SIZE s;
-	HFONT DlgFont;
 
 	void Relocation(BOOL is_init, int WW);
 
-	DECLARE_MESSAGE_MAP()
-public:
-	CListBox m_xcList;
-	int m_SelectItem;
-public:
-	afx_msg void OnBnClickedOk();
-public:
 	virtual BOOL OnInitDialog();
-public:
-	afx_msg void OnBnClickedCancel();
+	virtual BOOL OnOK();
+	virtual BOOL OnCancel();
+	virtual BOOL OnClose();
 };

Modified: branches/ssh_auth_dialog/teraterm/ttpmacro/errdlg.cpp
===================================================================
--- branches/ssh_auth_dialog/teraterm/ttpmacro/errdlg.cpp	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/teraterm/ttpmacro/errdlg.cpp	2019-04-24 14:08:16 UTC (rev 7613)
@@ -29,31 +29,28 @@
 
 /* TTMACRO.EXE, error dialog box */
 
-#include "stdafx.h"
+#include <windowsx.h>
+#include <stdio.h>
+
+#include "tmfc.h"
 #include "teraterm.h"
 #include "ttlib.h"
 #include "ttm_res.h"
-
 #include "tttypes.h"
 #include "ttcommon.h"
 #include "helpid.h"
-
-#include "errdlg.h"
 #include "ttmlib.h"
 #include "ttmparse.h"
+#include "htmlhelp.h"
+#include "dlglib.h"
+#include "ttmacro.h"
 
-#ifdef _DEBUG
-#define new DEBUG_NEW
-#undef THIS_FILE
-static char THIS_FILE[] = __FILE__;
-#endif
+#include "errdlg.h"
 
 // CErrDlg dialog
+
 CErrDlg::CErrDlg(PCHAR Msg, PCHAR Line, int x, int y, int lineno, int start, int end, PCHAR FileName)
-	: CDialog(CErrDlg::IDD)
 {
-	//{{AFX_DATA_INIT(CErrDlg)
-	//}}AFX_DATA_INIT
 	MsgStr = Msg;
 	LineStr = Line;
 	PosX = x;
@@ -64,44 +61,27 @@
 	MacroFileName = FileName;
 }
 
-BEGIN_MESSAGE_MAP(CErrDlg, CDialog)
-	//{{AFX_MSG_MAP(CErrDlg)
-	//}}AFX_MSG_MAP
-	ON_BN_CLICKED(IDC_MACROERRHELP, &CErrDlg::OnBnClickedMacroerrhelp)
-END_MESSAGE_MAP()
+INT_PTR CErrDlg::DoModal()
+{
+	HINSTANCE hInst = GetInstance();
+	HWND parent = GetHWND();
+	return TTCDialog::DoModal(hInst, parent, CErrDlg::IDD);
+}
 
-// CErrDlg message handler
-
 BOOL CErrDlg::OnInitDialog()
 {
+	static const DlgTextInfo TextInfos[] = {
+		{ IDOK, "BTN_STOP" },
+		{ IDCANCEL, "BTN_CONTINUE" },
+		{ IDC_MACROERRHELP, "BTN_HELP" },
+	};
 	RECT R;
 	HDC TmpDC;
-	char uimsg[MAX_UIMSG], uimsg2[MAX_UIMSG];
-	LOGFONT logfont;
-	HFONT font;
 	char buf[MaxLineLen*2], buf2[10];
 	int i, len;
 
-	CDialog::OnInitDialog();
-	font = (HFONT)SendMessage(WM_GETFONT, 0, 0);
-	GetObject(font, sizeof(LOGFONT), &logfont);
-	if (get_lang_font("DLG_SYSTEM_FONT", m_hWnd, &logfont, &DlgFont, UILanguageFile)) {
-		SendDlgItemMessage(IDC_ERRMSG, WM_SETFONT, (WPARAM)DlgFont, MAKELPARAM(TRUE,0));
-		SendDlgItemMessage(IDC_ERRLINE, WM_SETFONT, (WPARAM)DlgFont, MAKELPARAM(TRUE,0));
-		SendDlgItemMessage(IDOK, WM_SETFONT, (WPARAM)DlgFont, MAKELPARAM(TRUE,0));
-		SendDlgItemMessage(IDCANCEL, WM_SETFONT, (WPARAM)DlgFont, MAKELPARAM(TRUE,0));
-	}
+	SetDlgTexts(m_hWnd, TextInfos, _countof(TextInfos), UILanguageFile);
 
-	GetDlgItemText(IDOK, uimsg2, sizeof(uimsg2));
-	get_lang_msg("BTN_STOP", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-	SetDlgItemText(IDOK, uimsg);
-	GetDlgItemText(IDCANCEL, uimsg2, sizeof(uimsg2));
-	get_lang_msg("BTN_CONTINUE", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-	SetDlgItemText(IDCANCEL, uimsg);
-	GetDlgItemText(IDC_MACROERRHELP, uimsg2, sizeof(uimsg2));
-	get_lang_msg("BTN_HELP", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-	SetDlgItemText(IDC_MACROERRHELP, uimsg);
-
 	SetDlgItemText(IDC_ERRMSG,MsgStr);
 
 	// \x8Ds\x94ԍ\x86\x82\xF0\x90擪\x82ɂ\xAF\x82\xE9\x81B
@@ -132,8 +112,8 @@
 		PosY = (GetDeviceCaps(TmpDC,VERTRES)-R.bottom+R.top) / 2;
 		::ReleaseDC(GetSafeHwnd(),TmpDC);
 	}
-	SetWindowPos(&wndTop,PosX,PosY,0,0,SWP_NOSIZE);
-	SetForegroundWindow();
+	SetWindowPos(HWND_TOP, PosX, PosY, 0, 0, SWP_NOSIZE);
+	::SetForegroundWindow(m_hWnd);
 
 	return TRUE;
 }
@@ -142,3 +122,13 @@
 {
 	OpenHelp(HH_HELP_CONTEXT, HlpMacroAppendixesError, UILanguageFile);
 }
+
+BOOL CErrDlg::OnCommand(WPARAM wp, LPARAM lp)
+{
+	const WORD wID = GET_WM_COMMAND_ID(wp, lp);
+	if (wID == IDC_MACROERRHELP) {
+		OnBnClickedMacroerrhelp();
+		return TRUE;
+	}
+	return FALSE;
+}

Modified: branches/ssh_auth_dialog/teraterm/ttpmacro/errdlg.h
===================================================================
--- branches/ssh_auth_dialog/teraterm/ttpmacro/errdlg.h	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/teraterm/ttpmacro/errdlg.h	2019-04-24 14:08:16 UTC (rev 7613)
@@ -30,32 +30,24 @@
 /* TTMACRO.EXE, error dialog box */
 
 // CErrDlg dialog
-class CErrDlg : public CDialog
+#include "tmfc.h"
+
+class CErrDlg : public TTCDialog
 {
 public:
 	CErrDlg(PCHAR Msg, PCHAR Line, int x, int y, int lineno, int start, int end, PCHAR FileName);
+	INT_PTR DoModal();
 
-	//{{AFX_DATA(CErrDlg)
+private:
 	enum { IDD = IDD_ERRDLG };
-	//}}AFX_DATA
 
-	//{{AFX_VIRTUAL(CErrDlg)
-	//}}AFX_VIRTUAL
-
-protected:
 	PCHAR MsgStr, LineStr;
 	int PosX, PosY;
-	HFONT DlgFont;
 	int LineNo;
 	int StartPos, EndPos;
 	PCHAR MacroFileName;
 
-	//{{AFX_MSG(CErrDlg)
 	virtual BOOL OnInitDialog();
-	//}}AFX_MSG
-	DECLARE_MESSAGE_MAP()
-public:
-	afx_msg void OnBnClickedMacroerrhelp();
+	BOOL OnCommand(WPARAM wp, LPARAM lp);
+	void OnBnClickedMacroerrhelp();
 };
-
-typedef CErrDlg *PErrDlg;

Modified: branches/ssh_auth_dialog/teraterm/ttpmacro/inpdlg.cpp
===================================================================
--- branches/ssh_auth_dialog/teraterm/ttpmacro/inpdlg.cpp	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/teraterm/ttpmacro/inpdlg.cpp	2019-04-24 14:08:16 UTC (rev 7613)
@@ -29,28 +29,22 @@
 
 /* TTMACRO.EXE, input dialog box */
 
-#include "stdafx.h"
 #include "teraterm.h"
 #include "ttlib.h"
 #include "ttmdef.h"
 #include "ttm_res.h"
 #include "ttmlib.h"
+#include "dlglib.h"
+#include "ttmacro.h"
+#include "compat_win.h"
 
 #include "inpdlg.h"
 
-#ifdef _DEBUG
-#define new DEBUG_NEW
-#undef THIS_FILE
-static char THIS_FILE[] = __FILE__;
-#endif
-
 // CInpDlg dialog
 CInpDlg::CInpDlg(PCHAR Input, PCHAR Text, PCHAR Title,
                  PCHAR Default, BOOL Paswd,
-                 int x, int y) : CDialog(CInpDlg::IDD)
+                 int x, int y)
 {
-	//{{AFX_DATA_INIT(CInpDlg)
-	//}}AFX_DATA_INIT
 	InputStr = Input;
 	TextStr = Text;
 	TitleStr = Title;
@@ -58,62 +52,39 @@
 	PaswdFlag = Paswd;
 	PosX = x;
 	PosY = y;
-	DlgFont = NULL;
 }
 
-BEGIN_MESSAGE_MAP(CInpDlg, CDialog)
-	//{{AFX_MSG_MAP(CInpDlg)
-	ON_MESSAGE(WM_EXITSIZEMOVE, OnExitSizeMove)
-	//}}AFX_MSG_MAP
-END_MESSAGE_MAP()
+INT_PTR CInpDlg::DoModal()
+{
+	HINSTANCE hInst = GetInstance();
+	HWND parent = GetHWND();
+	return TTCDialog::DoModal(hInst, parent, CInpDlg::IDD);
+}
 
-// CInpDlg message handler
-
 // msgdlg \x82̂悤\x82ɁA\x83\x81\x83b\x83Z\x81[\x83W\x82\xAA\x92\xB7\x82\xA2\x8Fꍇ\x82ɂ̓_\x83C\x83A\x83\x8D\x83O\x82\xF0\x8Ag\x82\xB0\x82\xE9\x82悤\x82ɂ\xB5\x82\xBD (2006.7.29 maya)
 BOOL CInpDlg::OnInitDialog()
 {
+	static const DlgTextInfo TextInfos[] = {
+		{ IDOK, "BTN_OK" },
+	};
 	RECT R;
-	HDC TmpDC;
 	HWND HEdit, HOk;
-	char uimsg[MAX_UIMSG], uimsg2[MAX_UIMSG];
-	LOGFONT logfont;
-	HFONT font, tmpfont;
 
-	CDialog::OnInitDialog();
-	font = (HFONT)SendMessage(WM_GETFONT, 0, 0);
-	GetObject(font, sizeof(LOGFONT), &logfont);
-	if (get_lang_font("DLG_SYSTEM_FONT", m_hWnd, &logfont, &DlgFont, UILanguageFile)) {
-		SendDlgItemMessage(IDC_INPTEXT, WM_SETFONT, (WPARAM)DlgFont, MAKELPARAM(TRUE,0));
-		SendDlgItemMessage(IDC_INPEDIT, WM_SETFONT, (WPARAM)DlgFont, MAKELPARAM(TRUE,0));
-		SendDlgItemMessage(IDOK, WM_SETFONT, (WPARAM)DlgFont, MAKELPARAM(TRUE,0));
-	}
-
-	GetDlgItemText(IDOK, uimsg2, sizeof(uimsg2));
-	get_lang_msg("BTN_OK", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-	SetDlgItemText(IDOK, uimsg);
-
+	SetDlgTexts(m_hWnd, TextInfos, _countof(TextInfos), UILanguageFile);
 	SetWindowText(TitleStr);
 	SetDlgItemText(IDC_INPTEXT,TextStr);
 	SetDlgItemText(IDC_INPEDIT,DefaultStr);
 
-	TmpDC = ::GetDC(GetDlgItem(IDC_INPTEXT)->GetSafeHwnd());
-	if (DlgFont) {
-		tmpfont = (HFONT)SelectObject(TmpDC, DlgFont);
-	}
-	CalcTextExtent(TmpDC,TextStr,&s);
-	if (DlgFont && tmpfont != NULL) {
-		SelectObject(TmpDC, tmpfont);
-	}
-	::ReleaseDC(GetDlgItem(IDC_INPTEXT)->GetSafeHwnd(),TmpDC);
+	CalcTextExtent(GetDlgItem(IDC_INPTEXT), NULL, TextStr, &s);
 	TW = s.cx + s.cx/10;
 	TH = s.cy;
 
-	HEdit = ::GetDlgItem(GetSafeHwnd(), IDC_INPEDIT);
+	HEdit = GetDlgItem(IDC_INPEDIT);
 	::GetWindowRect(HEdit,&R);
 	EW = R.right-R.left;
 	EH = R.bottom-R.top;
 
-	HOk = ::GetDlgItem(GetSafeHwnd(), IDOK);
+	HOk = GetDlgItem(IDOK);
 	::GetWindowRect(HOk,&R);
 	BW = R.right-R.left;
 	BH = R.bottom-R.top;
@@ -124,18 +95,19 @@
 
 	Relocation(TRUE, WW);
 
-	BringupWindow(this->m_hWnd);
+	BringupWindow(m_hWnd);
 
 	return TRUE;
 }
 
-void CInpDlg::OnOK()
+BOOL CInpDlg::OnOK()
 {
 	GetDlgItemText(IDC_INPEDIT,InputStr,MaxStrLen-1);
 	EndDialog(IDOK);
+	return TRUE;
 }
 
-LONG CInpDlg::OnExitSizeMove(UINT wParam, LONG lParam)
+LRESULT CInpDlg::OnExitSizeMove(WPARAM wParam, LPARAM lParam)
 {
 	RECT R;
 
@@ -145,7 +117,7 @@
 	}
 	else if (R.bottom-R.top != WH || R.right-R.left < init_WW) {
 		// \x8D\x82\x82\xB3\x82\xAA\x95ύX\x82\xB3\x82ꂽ\x82\xA9\x81A\x8Dŏ\x89\x82\xE6\x82蕝\x82\xAA\x8B\xB7\x82\xAD\x82Ȃ\xC1\x82\xBD\x8Fꍇ\x82͌\xB3\x82ɖ߂\xB7
-		SetWindowPos(&wndTop,R.left,R.top,WW,WH,0);
+		SetWindowPos(HWND_TOP, R.left,R.top,WW,WH,0);
 	}
 	else {
 		// \x82\xBB\x82\xA4\x82łȂ\xAF\x82\xEA\x82΍Ĕz\x92u\x82\xB7\x82\xE9
@@ -152,7 +124,7 @@
 		Relocation(FALSE, R.right-R.left);
 	}
 
-	return CDialog::DefWindowProc(WM_EXITSIZEMOVE,wParam,lParam);
+	return TRUE;
 }
 
 void CInpDlg::Relocation(BOOL is_init, int new_WW)
@@ -185,9 +157,9 @@
 		WW = new_WW;
 	}
 
-	HText = ::GetDlgItem(GetSafeHwnd(), IDC_INPTEXT);
-	HOk = ::GetDlgItem(GetSafeHwnd(), IDOK);
-	HEdit = ::GetDlgItem(GetSafeHwnd(), IDC_INPEDIT);
+	HText = GetDlgItem(IDC_INPTEXT);
+	HOk = GetDlgItem(IDOK);
+	HEdit = GetDlgItem(IDC_INPEDIT);
 
 	::MoveWindow(HText,(TW-s.cx)/2,BH/2,TW,TH,TRUE);
 	::MoveWindow(HEdit,(WW-EW)/2-4,TH+BH,EW,EH,TRUE);
@@ -206,7 +178,23 @@
 		PosY = (GetDeviceCaps(TmpDC,VERTRES)-R.bottom+R.top) / 2;
 		::ReleaseDC(GetSafeHwnd(),TmpDC);
 	}
-	SetWindowPos(&wndTop,PosX,PosY,WW,WH,0);
+	SetWindowPos(HWND_TOP,PosX,PosY,WW,WH,0);
 
-	InvalidateRect(NULL);
+	InvalidateRect(NULL, TRUE);
 }
+
+LRESULT CInpDlg::DlgProc(UINT msg, WPARAM wp, LPARAM lp)
+{
+	switch(msg) {
+	case WM_EXITSIZEMOVE:
+		return OnExitSizeMove(wp, lp);
+	case WM_DPICHANGED: {
+		RECT rect;
+		::GetWindowRect(m_hWnd, &rect);
+		WW = rect.right - rect.left;
+		WH = rect.bottom - rect.top;
+		break;
+	}
+	}
+	return FALSE;
+}

Modified: branches/ssh_auth_dialog/teraterm/ttpmacro/inpdlg.h
===================================================================
--- branches/ssh_auth_dialog/teraterm/ttpmacro/inpdlg.h	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/teraterm/ttpmacro/inpdlg.h	2019-04-24 14:08:16 UTC (rev 7613)
@@ -29,33 +29,28 @@
 
 /* TTMACRO.EXE, input dialog box */
 
-class CInpDlg : public CDialog
+#include "../common/tmfc.h"
+
+class CInpDlg : public TTCDialog
 {
 public:
 	CInpDlg(PCHAR Input, PCHAR Text, PCHAR Title,
 	        PCHAR Default, BOOL Paswd,
 	        int x, int y);
+	INT_PTR DoModal();
 
-	//{{AFX_DATA(CInpDlg)
+private:
 	enum { IDD = IDD_INPDLG };
-	//}}AFX_DATA
 
-	//{{AFX_VIRTUAL(CInpDlg)
-	//}}AFX_VIRTUAL
-
-protected:
 	PCHAR InputStr, TextStr, TitleStr, DefaultStr;
 	BOOL PaswdFlag;
 	int PosX, PosY, init_WW, WW, WH, TW, TH, BH, BW, EW, EH;
 	SIZE s;
-	HFONT DlgFont;
 
-	//{{AFX_MSG(CInpDlg)
 	virtual BOOL OnInitDialog();
-	virtual void OnOK();
-	afx_msg LONG OnExitSizeMove(UINT wParam, LONG lParam);
-	//}}AFX_MSG
-	void Relocation(BOOL is_init, int WW);
-	DECLARE_MESSAGE_MAP()
+	virtual BOOL OnOK();
+	virtual LRESULT DlgProc(UINT msg, WPARAM wp, LPARAM lp);
+	LRESULT OnExitSizeMove(WPARAM wp, LPARAM lp);
+ 	void Relocation(BOOL is_init, int WW);
 };
-typedef CInpDlg *PInpDlg;
+

Modified: branches/ssh_auth_dialog/teraterm/ttpmacro/msgdlg.cpp
===================================================================
--- branches/ssh_auth_dialog/teraterm/ttpmacro/msgdlg.cpp	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/teraterm/ttpmacro/msgdlg.cpp	2019-04-24 14:08:16 UTC (rev 7613)
@@ -29,82 +29,64 @@
 
 /* TTMACRO.EXE, message dialog box */
 
-#include "stdafx.h"
+#include <windows.h>
+#include <windowsx.h>
 #include "teraterm.h"
 #include "ttlib.h"
 #include "ttm_res.h"
 #include "ttmlib.h"
+#include "tmfc.h"
+#include "dlglib.h"
+#include "ttmdlg.h"
+#include "ttmacro.h"
+#include "compat_win.h"
 
 #include "msgdlg.h"
 
-#ifdef _DEBUG
-#define new DEBUG_NEW
-#undef THIS_FILE
-static char THIS_FILE[] = __FILE__;
-#endif
-
 // CMsgDlg dialog
 
-CMsgDlg::CMsgDlg(PCHAR Text, PCHAR Title, BOOL YesNo,
-                 int x, int y) : CDialog(CMsgDlg::IDD)
+CMsgDlg::CMsgDlg(const TCHAR *Text, const TCHAR *Title, BOOL YesNo,
+                 int x, int y)
 {
-	//{{AFX_DATA_INIT(CMsgDlg)
-	//}}AFX_DATA_INIT
 	TextStr = Text;
 	TitleStr = Title;
 	YesNoFlag = YesNo;
 	PosX = x;
 	PosY = y;
-	DlgFont = NULL;
 }
 
-BEGIN_MESSAGE_MAP(CMsgDlg, CDialog)
-	//{{AFX_MSG_MAP(CMsgDlg)
-	ON_MESSAGE(WM_EXITSIZEMOVE, OnExitSizeMove)
-	//}}AFX_MSG_MAP
-END_MESSAGE_MAP()
+INT_PTR CMsgDlg::DoModal()
+{
+	HINSTANCE hInst = GetInstance();
+	HWND hWndParent = GetHWND();
+	return TTCDialog::DoModal(hInst, hWndParent, CMsgDlg::IDD);
+}
 
-// CMsgDlg message handler
-
 BOOL CMsgDlg::OnInitDialog()
 {
+	static const DlgTextInfo TextInfosOk[] = {
+		{ IDOK, "BTN_OK" },
+	};
+	static const DlgTextInfo TextInfosYesNo[] = {
+		{ IDOK, "BTN_YES" },
+		{ IDCANCEL, "BTN_NO" },
+	};
 	RECT R;
-	HDC TmpDC;
-	HWND HOk, HNo;
-	char uimsg[MAX_UIMSG], uimsg2[MAX_UIMSG];
-	LOGFONT logfont;
-	HFONT font, tmpfont;
+	HWND HOk;
 
-	CDialog::OnInitDialog();
-	font = (HFONT)SendMessage(WM_GETFONT, 0, 0);
-	GetObject(font, sizeof(LOGFONT), &logfont);
-	if (get_lang_font("DLG_SYSTEM_FONT", m_hWnd, &logfont, &DlgFont, UILanguageFile)) {
-		SendDlgItemMessage(IDC_MSGTEXT, WM_SETFONT, (WPARAM)DlgFont, MAKELPARAM(TRUE,0));
-		SendDlgItemMessage(IDOK, WM_SETFONT, (WPARAM)DlgFont, MAKELPARAM(TRUE,0));
-		SendDlgItemMessage(IDCLOSE, WM_SETFONT, (WPARAM)DlgFont, MAKELPARAM(TRUE,0));
+	if (YesNoFlag) {
+		SetDlgTexts(m_hWnd, TextInfosYesNo, _countof(TextInfosYesNo), UILanguageFile);
+	} else {
+		SetDlgTexts(m_hWnd, TextInfosOk, _countof(TextInfosOk), UILanguageFile);
 	}
 
-	GetDlgItemText(IDOK, uimsg2, sizeof(uimsg2));
-	get_lang_msg("BTN_OK", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-	SetDlgItemText(IDOK, uimsg);
-
 	SetWindowText(TitleStr);
 	SetDlgItemText(IDC_MSGTEXT,TextStr);
-
-	TmpDC = ::GetDC(GetDlgItem(IDC_MSGTEXT)->GetSafeHwnd());
-	if (DlgFont) {
-		tmpfont = (HFONT)SelectObject(TmpDC, DlgFont);
-	}
-	CalcTextExtent(TmpDC,TextStr,&s);
-	if (DlgFont && tmpfont != NULL) {
-		SelectObject(TmpDC, tmpfont);
-	}
-	::ReleaseDC(GetDlgItem(IDC_MSGTEXT)->GetSafeHwnd(),TmpDC);
+	CalcTextExtent(GetDlgItem(IDC_MSGTEXT), NULL, TextStr, &s);
 	TW = s.cx + s.cx/10;
 	TH = s.cy;
 
 	HOk = ::GetDlgItem(GetSafeHwnd(), IDOK);
-	HNo = ::GetDlgItem(GetSafeHwnd(), IDCLOSE);
 	::GetWindowRect(HOk,&R);
 	BW = R.right-R.left;
 	BH = R.bottom-R.top;
@@ -120,17 +102,17 @@
 	return TRUE;
 }
 
-LONG CMsgDlg::OnExitSizeMove(UINT wParam, LONG lParam)
+LRESULT CMsgDlg::OnExitSizeMove(WPARAM wParam, LPARAM lParam)
 {
 	RECT R;
 
 	GetWindowRect(&R);
-	if (R.bottom-R.top == WH && R.right-R.left == WW) {
+		if (R.bottom-R.top == WH && R.right-R.left == WW) {
 		// \x83T\x83C\x83Y\x82\xAA\x95ς\xED\x82\xC1\x82Ă\xA2\x82Ȃ\xAF\x82\xEA\x82Ή\xBD\x82\xE0\x82\xB5\x82Ȃ\xA2
 	}
 	else if (R.bottom-R.top != WH || R.right-R.left < init_WW) {
 		// \x8D\x82\x82\xB3\x82\xAA\x95ύX\x82\xB3\x82ꂽ\x82\xA9\x81A\x8Dŏ\x89\x82\xE6\x82蕝\x82\xAA\x8B\xB7\x82\xAD\x82Ȃ\xC1\x82\xBD\x8Fꍇ\x82͌\xB3\x82ɖ߂\xB7
-		SetWindowPos(&wndTop,R.left,R.top,WW,WH,0);
+		SetWindowPos(HWND_TOP,R.left,R.top,WW,WH,0);
 	}
 	else {
 		// \x82\xBB\x82\xA4\x82łȂ\xAF\x82\xEA\x82΍Ĕz\x92u\x82\xB7\x82\xE9
@@ -137,7 +119,7 @@
 		Relocation(FALSE, R.right-R.left);
 	}
 
-	return CDialog::DefWindowProc(WM_EXITSIZEMOVE,wParam,lParam);
+	return TRUE;
 }
 
 void CMsgDlg::Relocation(BOOL is_init, int new_WW)
@@ -146,7 +128,6 @@
 	HDC TmpDC;
 	HWND HText, HOk, HNo;
 	int CW, CH;
-	char uimsg[MAX_UIMSG], uimsg2[MAX_UIMSG];
 
 	GetClientRect(&R);
 	CW = R.right-R.left;
@@ -173,20 +154,10 @@
 
 	HText = ::GetDlgItem(GetSafeHwnd(), IDC_MSGTEXT);
 	HOk = ::GetDlgItem(GetSafeHwnd(), IDOK);
-	HNo = ::GetDlgItem(GetSafeHwnd(), IDCLOSE);
+	HNo = ::GetDlgItem(GetSafeHwnd(), IDCANCEL);
 
 	::MoveWindow(HText,(TW-s.cx)/2, BH/2,TW,TH,TRUE);
 	if (YesNoFlag) {
-		if (is_init) {
-			::SetWindowText(HOk,"&Yes");
-			::SetWindowText(HNo,"&No");
-			GetDlgItemText(IDOK, uimsg2, sizeof(uimsg2));
-			get_lang_msg("BTN_YES", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			::SetWindowText(HOk,uimsg);
-			GetDlgItemText(IDCLOSE, uimsg2, sizeof(uimsg2));
-			get_lang_msg("BTN_NO", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-			::SetWindowText(HNo,uimsg);
-		}
 		::MoveWindow(HOk,(2*TW-5*BW)/4,TH+BH,BW,BH,TRUE);
 		::MoveWindow(HNo,(2*TW+BW)/4,TH+BH,BW,BH,TRUE);
 		::ShowWindow(HNo,SW_SHOW);
@@ -201,38 +172,48 @@
 		PosY = (GetDeviceCaps(TmpDC,VERTRES)-WH) / 2;
 		::ReleaseDC(GetSafeHwnd(),TmpDC);
 	}
-	SetWindowPos(&wndTop,PosX,PosY,WW,WH,0);
+	SetWindowPos(HWND_TOP,PosX,PosY,WW,WH,0);
 	InvalidateRect(NULL);
 }
 
-BOOL CMsgDlg::OnCommand(WPARAM wParam, LPARAM lParam)
+BOOL CMsgDlg::OnCancel()
 {
-	switch (LOWORD(wParam)) {
-	case IDCANCEL:
-		if( HIWORD(wParam) == BN_CLICKED ) {
-			// \x83\x81\x83b\x83Z\x81[\x83W\x83{\x83b\x83N\x83X\x82\xF0\x83L\x83\x83\x83\x93\x83Z\x83\x8B\x82\xB7\x82\xE9\x82ƁA\x83}\x83N\x83\x8D\x82̏I\x97\xB9\x82Ƃ\xB7\x82\xE9\x81B
-			// (2008.8.5 yutaka)	
-			int ret;
-			char uimsg[MAX_UIMSG], uimsg2[MAX_UIMSG];
-			get_lang_msg("MSG_MACRO_CONF", uimsg, sizeof(uimsg), "MACRO: confirmation", UILanguageFile);
-			get_lang_msg("MSG_MACRO_HALT_SCRIPT", uimsg2, sizeof(uimsg2), "Are you sure that you want to halt this macro script?", UILanguageFile);
-			ret = MessageBox(uimsg2, uimsg, MB_YESNO | MB_ICONWARNING | MB_DEFBUTTON2);
-			if (ret == IDYES) {
-				if (YesNoFlag == TRUE) {
-					EndDialog(IDCLOSE);
-				} else {
-					EndDialog(IDCANCEL);
-				}
-			}
-			return TRUE;
-		}
-		return FALSE;
-
-	case IDCLOSE:
-		EndDialog(IDCANCEL);
+	if (!YesNoFlag) {
+		// ok(yes)\x82\xBE\x82\xAF\x82̂Ƃ\xAB\x82́Acancel\x8F\x88\x97\x9D\x82͉\xBD\x82\xE0\x82\xB5\x82Ȃ\xA2
 		return TRUE;
+	} else {
+		// yes/no\x82̂Ƃ\xAB\x82́A\x83f\x83t\x83H\x83\x8B\x83g\x8F\x88\x97\x9D(\x8FI\x97\xB9)
+		return TTCDialog::OnCancel();
+	}
+}
 
-	default:
-		return (CDialog::OnCommand(wParam,lParam));
+// \x83\x81\x83b\x83Z\x81[\x83W\x83{\x83b\x83N\x83X\x82\xF0\x83L\x83\x83\x83\x93\x83Z\x83\x8B\x82\xB7\x82\xE9(close\x83{\x83^\x83\x93\x82\xF0\x89\x9F\x82\xB7)\x82ƁA\x83}\x83N\x83\x8D\x82̏I\x97\xB9\x82Ƃ\xB7\x82\xE9\x81B
+// (2008.8.5 yutaka)	
+BOOL CMsgDlg::OnClose()
+{
+	const int ret = MessageBoxHaltScript(m_hWnd);
+	if (ret == IDYES) {
+		if (YesNoFlag == TRUE) {
+			EndDialog(IDCLOSE);
+		} else {
+			EndDialog(IDCANCEL);
+		}
 	}
+	return TRUE;
 }
+
+LRESULT CMsgDlg::DlgProc(UINT msg, WPARAM wp, LPARAM lp)
+{
+	switch(msg) {
+	case WM_EXITSIZEMOVE:
+		return OnExitSizeMove(wp, lp);
+	case WM_DPICHANGED: {
+		RECT rect;
+		::GetWindowRect(m_hWnd, &rect);
+		WW = rect.right - rect.left;
+		WH = rect.bottom - rect.top;
+		break;
+	}
+	}
+	return FALSE;
+}

Modified: branches/ssh_auth_dialog/teraterm/ttpmacro/msgdlg.h
===================================================================
--- branches/ssh_auth_dialog/teraterm/ttpmacro/msgdlg.h	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/teraterm/ttpmacro/msgdlg.h	2019-04-24 14:08:16 UTC (rev 7613)
@@ -29,31 +29,28 @@
 
 /* TTMACRO.EXE, message dialog box */
 
-class CMsgDlg : public CDialog
+#include "ttm_res.h"
+
+class CMsgDlg : public TTCDialog
 {
 public:
-	CMsgDlg(PCHAR Text, PCHAR Title, BOOL YesNo,
-	        int x, int y);
+	CMsgDlg(const TCHAR *Text, const TCHAR *Title, BOOL YesNo, int x, int y);
+	INT_PTR DoModal();
 
-	//{{AFX_DATA(CMsgDlg)
+private:
 	enum { IDD = IDD_MSGDLG };
-	//}}AFX_DATA
 
-	//{{AFX_VIRTUAL(CMsgDlg)
-	virtual BOOL OnCommand(WPARAM wParam, LPARAM lParam);
-	//}}AFX_VIRTUAL
-
-protected:
-	PCHAR TextStr, TitleStr;
+	const TCHAR *TextStr;
+	const TCHAR *TitleStr;
 	BOOL YesNoFlag;
 	int  PosX, PosY, init_WW, WW, WH, TW, TH, BH, BW;
 	SIZE s;
-	HFONT DlgFont;
 
-	//{{AFX_MSG(CMsgDlg)
 	virtual BOOL OnInitDialog();
-	afx_msg LONG OnExitSizeMove(UINT wParam, LONG lParam);
-	//}}AFX_MSG
+	virtual BOOL OnClose();
+	virtual BOOL OnCancel();
+	virtual LRESULT DlgProc(UINT msg, WPARAM wp, LPARAM lp);
+
+	LRESULT OnExitSizeMove(WPARAM wParam, LPARAM lParam);
 	void Relocation(BOOL is_init, int WW);
-	DECLARE_MESSAGE_MAP()
 };

Modified: branches/ssh_auth_dialog/teraterm/ttpmacro/statdlg.cpp
===================================================================
--- branches/ssh_auth_dialog/teraterm/ttpmacro/statdlg.cpp	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/teraterm/ttpmacro/statdlg.cpp	2019-04-24 14:08:16 UTC (rev 7613)
@@ -29,30 +29,20 @@
 
 /* TTMACRO.EXE, status dialog box */
 
-#include "stdafx.h"
+#include <assert.h>
+#include <crtdbg.h>
 #include "teraterm.h"
 #include "ttlib.h"
 #include "ttm_res.h"
 #include "ttmlib.h"
+#include "tmfc.h"
+#include "tttypes.h"
+#include "ttmacro.h"
 
 #include "statdlg.h"
-#include "tttypes.h"
 
-#ifdef _DEBUG
-#define new DEBUG_NEW
-#undef THIS_FILE
-static char THIS_FILE[] = __FILE__;
-#endif
-
 // CStatDlg dialog
 
-BEGIN_MESSAGE_MAP(CStatDlg, CDialog)
-	//{{AFX_MSG_MAP(CStatDlg)
-	ON_MESSAGE(WM_EXITSIZEMOVE, OnExitSizeMove)
-	ON_MESSAGE(WM_USER_MSTATBRINGUP, OnSetForceForegroundWindow)
-	//}}AFX_MSG_MAP
-END_MESSAGE_MAP()
-
 BOOL CStatDlg::Create(PCHAR Text, PCHAR Title, int x, int y)
 {
 	TextStr = Text;
@@ -59,15 +49,13 @@
 	TitleStr = Title;
 	PosX = x;
 	PosY = y;
-	DlgFont = NULL;
-	return CDialog::Create(CStatDlg::IDD, GetDesktopWindow());
+	HINSTANCE hInst = GetInstance();
+	return TTCDialog::Create(hInst, GetDesktopWindow(), CStatDlg::IDD);
 }
 
 void CStatDlg::Update(PCHAR Text, PCHAR Title, int x, int y)
 {
 	RECT R;
-	HDC TmpDC;
-	HFONT tmpfont;
 
 	if (Title!=NULL) {
 		SetWindowText(Title);
@@ -81,17 +69,12 @@
 	WH = R.bottom-R.top;
 
 	if (Text!=NULL) {
-		TmpDC = ::GetDC(GetDlgItem(IDC_STATTEXT)->GetSafeHwnd());
-		if (DlgFont) {
-			tmpfont = (HFONT)SelectObject(TmpDC, DlgFont);
-		}
-		CalcTextExtent(TmpDC,Text,&s);
-		if (DlgFont && tmpfont != NULL) {
-			SelectObject(TmpDC, tmpfont);
-		}
-		::ReleaseDC(GetDlgItem(IDC_STATTEXT)->GetSafeHwnd(),TmpDC);
-		TW = s.cx + s.cx/10;
-		TH = s.cy;
+		SIZE textSize;
+		HWND hWnd = GetDlgItem(IDC_STATTEXT);
+		CalcTextExtent(hWnd, NULL, Text, &textSize);
+		TW = textSize.cx + textSize.cx/10;	// (cx * (1+0.1)) ?
+		TH = textSize.cy;
+		s = textSize;			// TODO s!?
 
 		SetDlgItemText(IDC_STATTEXT,Text);
 		TextStr = Text;
@@ -109,66 +92,56 @@
 
 BOOL CStatDlg::OnInitDialog()
 {
-	LOGFONT logfont;
-	HFONT font;
 
-	CDialog::OnInitDialog();
 	Update(TextStr,TitleStr,PosX,PosY);
-	SetForegroundWindow();
+	SetForegroundWindow(m_hWnd);
+	return TRUE;
+}
 
-	font = (HFONT)SendMessage(WM_GETFONT, 0, 0);
-	GetObject(font, sizeof(LOGFONT), &logfont);
-	if (get_lang_font("DLG_SYSTEM_FONT", m_hWnd, &logfont, &DlgFont, UILanguageFile)) {
-		SendDlgItemMessage(IDC_STATTEXT, WM_SETFONT, (WPARAM)DlgFont, MAKELPARAM(TRUE,0));
-	}
-
+BOOL CStatDlg::OnOK()
+{
 	return TRUE;
 }
 
-void CStatDlg::OnCancel()
+BOOL CStatDlg::OnCancel()
 {
 	DestroyWindow();
+	return TRUE;
 }
 
 BOOL CStatDlg::OnCommand(WPARAM wParam, LPARAM lParam)
 {
 	switch (LOWORD(wParam)) {
-		case IDOK:  // Enter key\x89\x9F\x89\xBA\x82ŏ\xC1\x82\xA6\x82Ȃ\xA2\x82悤\x82ɂ\xB7\x82\xE9\x81B(2010.8.25 yutaka)
-			return TRUE;
-		case IDCANCEL:
-			if ((HWND)lParam!=NULL) { // ignore ESC key
-				DestroyWindow();
-			}
-			return TRUE;
-		default:
-		return (CDialog::OnCommand(wParam,lParam));
+	case IDOK:
+		// Enter key\x89\x9F\x89\xBA\x82ŏ\xC1\x82\xA6\x82Ȃ\xA2\x82悤\x82ɂ\xB7\x82\xE9\x81B(2010.8.25 yutaka)
+		return TRUE;
+	case IDCANCEL:
+		if ((HWND)lParam!=NULL) { // ignore ESC key
+			DestroyWindow();
+		}
+		return TRUE;
+	default:
+		return FALSE;
 	}
 }
 
-void CStatDlg::PostNcDestroy()
+BOOL CStatDlg::PostNcDestroy()
 {
-	// statusbox\x82\xC6closesbox\x82\xF0\x8CJ\x82\xE8\x95Ԃ\xB7\x82ƁAGDI\x83\x8A\x83\\x81[\x83X\x83\x8A\x81[\x83N\x82ƂȂ\xE9\x96\xE2\x91\xE8\x82\xF0\x8FC\x90\xB3\x82\xB5\x82\xBD\x81B
-	//   - CreateFontIndirect()\x82ō쐬\x82\xB5\x82\xBD\x98_\x97\x9D\x83t\x83H\x83\x93\x83g\x82\xF0\x8D폜\x82\xB7\x82\xE9\x81B
-	// (2016.10.5 yutaka)
-	if (DlgFont) {
-		DeleteObject(DlgFont);
-		DlgFont = NULL;
-	}
-
 	delete this;
+	return TRUE;
 }
 
-LONG CStatDlg::OnExitSizeMove(UINT wParam, LONG lParam)
+LRESULT CStatDlg::OnExitSizeMove(WPARAM wParam, LPARAM lParam)
 {
 	RECT R;
 
-	GetWindowRect(&R);
+	::GetWindowRect(m_hWnd, &R);
 	if (R.bottom-R.top == WH && R.right-R.left == WW) {
 		// \x83T\x83C\x83Y\x82\xAA\x95ς\xED\x82\xC1\x82Ă\xA2\x82Ȃ\xAF\x82\xEA\x82Ή\xBD\x82\xE0\x82\xB5\x82Ȃ\xA2
 	}
 	else if (R.bottom-R.top != WH || R.right-R.left < init_WW) {
 		// \x8D\x82\x82\xB3\x82\xAA\x95ύX\x82\xB3\x82ꂽ\x82\xA9\x81A\x8Dŏ\x89\x82\xE6\x82蕝\x82\xAA\x8B\xB7\x82\xAD\x82Ȃ\xC1\x82\xBD\x8Fꍇ\x82͌\xB3\x82ɖ߂\xB7
-		SetWindowPos(&wndTop,R.left,R.top,WW,WH,0);
+		::SetWindowPos(m_hWnd, HWND_TOP, R.left,R.top,WW,WH,0);
 	}
 	else {
 		// \x82\xBB\x82\xA4\x82łȂ\xAF\x82\xEA\x82΍Ĕz\x92u\x82\xB7\x82\xE9
@@ -175,10 +148,10 @@
 		Relocation(FALSE, R.right-R.left);
 	}
 
-	return CDialog::DefWindowProc(WM_EXITSIZEMOVE,wParam,lParam);
+	return TRUE;
 }
 
-LONG CStatDlg::OnSetForceForegroundWindow(UINT wParam, LONG lParam)
+LRESULT CStatDlg::OnSetForceForegroundWindow(WPARAM wParam, LPARAM lParam)
 {
 	DWORD pid;
 	DWORD targetid;
@@ -188,12 +161,12 @@
 	targetid = GetWindowThreadProcessId(hwnd, &pid);
 	currentActiveThreadId = GetWindowThreadProcessId(::GetForegroundWindow(), &pid);
 
-	SetForegroundWindow();
+	::SetForegroundWindow(m_hWnd);
 	if (targetid == currentActiveThreadId) {
-		BringWindowToTop();
+		BringWindowToTop(m_hWnd);
 	} else {
 		AttachThreadInput(targetid, currentActiveThreadId, TRUE);
-		BringWindowToTop();
+		BringWindowToTop(m_hWnd);
 		AttachThreadInput(targetid, currentActiveThreadId, FALSE);
 	}
 
@@ -208,7 +181,7 @@
 	int CW, CH;
 
 	if (TextStr != NULL) {
-		HText = ::GetDlgItem(GetSafeHwnd(), IDC_STATTEXT);
+		HText = GetDlgItem(IDC_STATTEXT);
 
 		GetClientRect(&R);
 		CW = R.right-R.left;
@@ -239,14 +212,14 @@
 		PosY = (GetDeviceCaps(TmpDC,VERTRES)-WH) / 2;
 		::ReleaseDC(GetSafeHwnd(),TmpDC);
 	}
-	SetWindowPos(&wndTop,PosX,PosY,WW,WH,SWP_NOZORDER);
+	SetWindowPos(HWND_TOP,PosX,PosY,WW,WH,SWP_NOZORDER);
 
-	InvalidateRect(NULL);
+	InvalidateRect(NULL, TRUE);
 }
 
 void CStatDlg::Bringup()
 {
-	BringupWindow(this->m_hWnd);
+	BringupWindow(m_hWnd);
 }
 
 BOOL CStatDlg::CheckAutoCenter()
@@ -255,3 +228,15 @@
 	// Don't call CenterWindow()
 	return FALSE;
 }
+
+LRESULT CStatDlg::DlgProc(UINT msg, WPARAM wp, LPARAM lp)
+{
+	switch(msg) {
+	case WM_USER_MSTATBRINGUP:
+		return OnSetForceForegroundWindow(wp, lp);
+	case WM_EXITSIZEMOVE :
+		return OnExitSizeMove(wp, lp);
+	}
+	return FALSE;
+}
+

Modified: branches/ssh_auth_dialog/teraterm/ttpmacro/statdlg.h
===================================================================
--- branches/ssh_auth_dialog/teraterm/ttpmacro/statdlg.h	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/teraterm/ttpmacro/statdlg.h	2019-04-24 14:08:16 UTC (rev 7613)
@@ -29,38 +29,29 @@
 
 /* TTMACRO.EXE, status dialog box */
 
-class CStatDlg : public CDialog
+class CStatDlg : public TTCDialog
 {
 public:
 	BOOL Create(PCHAR Text, PCHAR Title, int x, int y);
 	void Update(PCHAR Text, PCHAR Title, int x, int y);
 	void Bringup();
-	virtual BOOL CheckAutoCenter();
-
-	//{{AFX_DATA(CStatDlg)
 	enum { IDD = IDD_STATDLG };
-	//}}AFX_DATA
-
-	//{{AFX_VIRTUAL(CStatDlg)
-	protected:
-	virtual void OnCancel( );
-	virtual BOOL OnCommand(WPARAM wParam, LPARAM lParam);
-	virtual void PostNcDestroy();
-	//}}AFX_VIRTUAL
-
-protected:
+private:
 	PCHAR TextStr, TitleStr;
 	int  PosX, PosY, init_WW, WW, WH, TW, TH;
 	SIZE s;
-	HFONT DlgFont;
 
-	//{{AFX_MSG(CStatDlg)
 	virtual BOOL OnInitDialog();
-	afx_msg LONG OnExitSizeMove(UINT wParam, LONG lParam);
-	afx_msg LONG OnSetForceForegroundWindow(UINT wParam, LONG lParam);
-	//}}AFX_MSG
+	virtual BOOL OnOK();
+	virtual BOOL OnCancel();
+	virtual BOOL OnCommand(WPARAM wParam, LPARAM lParam);
+	virtual BOOL PostNcDestroy();
+	virtual LRESULT DlgProc(UINT msg, WPARAM wp, LPARAM lp);
+
+	LRESULT OnExitSizeMove(WPARAM wParam, LPARAM lParam);
+	LRESULT OnSetForceForegroundWindow(WPARAM wParam, LPARAM lParam);
+
 	void Relocation(BOOL is_init, int WW);
-	DECLARE_MESSAGE_MAP()
+
+	BOOL CheckAutoCenter();
 };
-
-typedef CStatDlg *PStatDlg;

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

Modified: branches/ssh_auth_dialog/teraterm/ttpmacro/ttl.c
===================================================================
--- branches/ssh_auth_dialog/teraterm/ttpmacro/ttl.c	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/teraterm/ttpmacro/ttl.c	2019-04-24 14:08:16 UTC (rev 7613)
@@ -3522,6 +3522,7 @@
 		// return 
 		//   0\x88ȏ\xE3: \x91I\x91\xF0\x8D\x80\x96\xDA
 		//   -1: \x83L\x83\x83\x83\x93\x83Z\x83\x8B
+		//	 -2: close
 		ret = OpenListDlg(Str1, Str2, s, sel);
 
 		for (i = 0 ; i < ary_size ; i++) {
@@ -3529,6 +3530,10 @@
 		}
 		free(s);
 
+		// \x83\x8A\x83X\x83g\x83{\x83b\x83N\x83X\x82̕\xB6\x82\xE9\x83{\x83^\x83\x93(&\x8Am\x94F\x83_\x83C\x83A\x83\x8D\x83O)\x82ŁA\x83}\x83N\x83\x8D\x82̏I\x97\xB9\x82Ƃ\xB7\x82\xE9\x81B
+		if (ret == -2) {
+			TTLStatus = IdTTLEnd;
+		}
 		return (ret);
 
 	}

Modified: branches/ssh_auth_dialog/teraterm/ttpmacro/ttm_res.h
===================================================================
--- branches/ssh_auth_dialog/teraterm/ttpmacro/ttm_res.h	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/teraterm/ttpmacro/ttm_res.h	2019-04-24 14:08:16 UTC (rev 7613)
@@ -21,17 +21,17 @@
 #define IDI_TTMACRO_3D                  601
 #define IDC_LISTBOX                     602
 #define IDC_MACROERRHELP                603
-#define IDC_EDIT1                       604
-#define IDC_EDIT_ERRLINE                604
-#define IDC_FILENAME                    605
+#define IDC_LISTTEXT                    604
+#define IDC_EDIT_ERRLINE                605
+#define IDC_FILENAME                    606
 
 // Next default values for new objects
 // 
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE        602
+#define _APS_NEXT_RESOURCE_VALUE        607
 #define _APS_NEXT_COMMAND_VALUE         32771
-#define _APS_NEXT_CONTROL_VALUE         606
+#define _APS_NEXT_CONTROL_VALUE         607
 #define _APS_NEXT_SYMED_VALUE           101
 #endif
 #endif

Modified: branches/ssh_auth_dialog/teraterm/ttpmacro/ttmacro.cpp
===================================================================
--- branches/ssh_auth_dialog/teraterm/ttpmacro/ttmacro.cpp	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/teraterm/ttpmacro/ttmacro.cpp	2019-04-24 14:08:16 UTC (rev 7613)
@@ -29,90 +29,60 @@
 
 /* TTMACRO.EXE, main */
 
-#include "stdafx.h"
+#include <stdio.h>
+#include <crtdbg.h>
+#include <windows.h>
+#include <commctrl.h>
+
 #include "teraterm.h"
+#include "compat_w95.h"
+#include "compat_win.h"
+#include "ttmdlg.h"
+#include "tmfc.h"
+#include "dlglib.h"
+#include "dllutil.h"
+
 #include "ttm_res.h"
 #include "ttmmain.h"
 #include "ttl.h"
-
 #include "ttmacro.h"
 #include "ttmlib.h"
 #include "ttlib.h"
 
-#include "compat_w95.h"
-
 #ifdef _DEBUG
-#define new DEBUG_NEW
-#undef THIS_FILE
-static char THIS_FILE[] = __FILE__;
+#define new new(_NORMAL_BLOCK, __FILE__, __LINE__)
 #endif
 
 char UILanguageFile[MAX_PATH];
+static HWND CtrlWnd;
+static HINSTANCE hInst;
 
-/////////////////////////////////////////////////////////////////////////////
+static BOOL Busy;
+static CCtrlWindow *pCCtrlWindow;
 
-BEGIN_MESSAGE_MAP(CCtrlApp, CWinApp)
-	//{{AFX_MSG_MAP(CCtrlApp)
-	//}}AFX_MSG
-END_MESSAGE_MAP()
-
-/////////////////////////////////////////////////////////////////////////////
-
-CCtrlApp::CCtrlApp()
+HINSTANCE GetInstance()
 {
-	typedef BOOL (WINAPI *pSetDllDir)(LPCSTR);
-	typedef BOOL (WINAPI *pSetDefDllDir)(DWORD);
-
-	HMODULE module;
-	pSetDllDir setDllDir;
-	pSetDefDllDir setDefDllDir;
-
-	if ((module = GetModuleHandle("kernel32.dll")) != NULL) {
-		if ((setDefDllDir = (pSetDefDllDir)GetProcAddress(module, "SetDefaultDllDirectories")) != NULL) {
-			// SetDefaultDllDirectories() \x82\xAA\x8Eg\x82\xA6\x82\xE9\x8Fꍇ\x82́A\x8C\x9F\x8D\xF5\x83p\x83X\x82\xF0 %WINDOWS%\system32 \x82݂̂ɐݒ肷\x82\xE9
-			(*setDefDllDir)((DWORD)0x00000800); // LOAD_LIBRARY_SEARCH_SYSTEM32
-		}
-		else if ((setDllDir = (pSetDllDir)GetProcAddress(module, "SetDllDirectoryA")) != NULL) {
-			// SetDefaultDllDirectories() \x82\xAA\x8Eg\x82\xA6\x82Ȃ\xAD\x82Ă\xE0\x81ASetDllDirectory() \x82\xAA\x8Eg\x82\xA6\x82\xE9\x8Fꍇ\x82\xCD
-			// \x83J\x83\x8C\x83\x93\x83g\x83f\x83B\x83\x8C\x83N\x83g\x83\x8A\x82\xBE\x82\xAF\x82ł\xE0\x8C\x9F\x8D\xF5\x83p\x83X\x82\xA9\x82\xE7\x82͂\xB8\x82\xB5\x82Ă\xA8\x82\xAD\x81B
-			(*setDllDir)("");
-		}
-	}
+	return hInst;
 }
 
-/////////////////////////////////////////////////////////////////////////////
-
-CCtrlApp theApp;
-
-/////////////////////////////////////////////////////////////////////////////
-
-
-
-BOOL CCtrlApp::InitInstance()
+HWND GetHWND()
 {
-	static HMODULE HTTSET = NULL;
-
-	GetUILanguageFile(UILanguageFile, sizeof(UILanguageFile));
-
-	Busy = TRUE;
-	m_pMainWnd = new CCtrlWindow();
-	PCtrlWindow(m_pMainWnd)->Create();
-	Busy = FALSE;  
-	return TRUE;
+	return CtrlWnd;
 }
 
-int CCtrlApp::ExitInstance()
+static void init()
 {
-	//delete m_pMainWnd;
-	if (m_pMainWnd) {
-		m_pMainWnd->DestroyWindow();
+	DLLInit();
+	WinCompatInit();
+	if (pSetThreadDpiAwarenessContext) {
+		pSetThreadDpiAwarenessContext(DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE_V2);
 	}
-	m_pMainWnd = NULL;
-	return ExitCode;
+	// messagebox\x82̃t\x83H\x83\x93\x83g\x82ɐݒ肷\x82\xE9
+	SetDialogFont(NULL, NULL, NULL, NULL);
 }
 
 // TTMACRO main engine
-BOOL CCtrlApp::OnIdle(LONG lCount)
+static BOOL OnIdle(LONG lCount)
 {
 	BOOL Continue;
 
@@ -121,8 +91,8 @@
 		return FALSE;
 	}
 	Busy = TRUE;
-	if (m_pMainWnd != NULL) {
-		Continue = PCtrlWindow(m_pMainWnd)->OnIdle();
+	if (pCCtrlWindow != NULL) {
+		Continue = pCCtrlWindow->OnIdle();
 	}
 	else {
 		Continue = FALSE;
@@ -130,3 +100,68 @@
 	Busy = FALSE;
 	return Continue;
 }
+
+/////////////////////////////////////////////////////////////////////////////
+
+// CCtrlApp theApp;
+
+/////////////////////////////////////////////////////////////////////////////
+
+int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPreInst,
+                   LPSTR lpszCmdLine, int nCmdShow)
+{
+	hInst = hInstance;
+	LONG lCount = 0;
+	DWORD SleepTick = 1;
+
+#ifdef _DEBUG
+	::_CrtSetDbgFlag(_CRTDBG_ALLOC_MEM_DF | _CRTDBG_LEAK_CHECK_DF);
+#endif
+
+	init();
+//	InitCommonControls();
+	GetUILanguageFile(UILanguageFile, sizeof(UILanguageFile));
+
+	Busy = TRUE;
+	pCCtrlWindow = new CCtrlWindow();
+	pCCtrlWindow->Create();
+	Busy = FALSE;
+
+	HWND hWnd = pCCtrlWindow->GetSafeHwnd();
+	CtrlWnd = hWnd;
+
+	//////////////////////////////////////////////////////////////////////
+	MSG msg;
+	while (GetMessage(&msg, NULL, 0, 0)) {
+
+		if (IsDialogMessage(hWnd, &msg) != 0) {
+			/* \x8F\x88\x97\x9D\x82\xB3\x82ꂽ*/
+		} else {
+			TranslateMessage(&msg);
+			DispatchMessage(&msg);
+		}
+
+		while (!PeekMessage(&msg, NULL, NULL, NULL, PM_NOREMOVE)) {
+			// \x83\x81\x83b\x83Z\x81[\x83W\x82\xAA\x82Ȃ\xA2
+			if (!OnIdle(lCount)) {
+				// idle\x95s\x97v
+				if (SleepTick < 500) {	// \x8Dő\xE5 501ms\x96\xA2\x96\x9E
+					SleepTick += 2;
+				}
+				lCount = 0;
+				Sleep(SleepTick);
+			} else {
+				// \x97vidle
+				SleepTick = 0;
+				lCount++;
+			}
+		}
+	}
+
+	// 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 = NULL;
+	return ExitCode;
+}

Modified: branches/ssh_auth_dialog/teraterm/ttpmacro/ttmacro.h
===================================================================
--- branches/ssh_auth_dialog/teraterm/ttpmacro/ttmacro.h	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/teraterm/ttpmacro/ttmacro.h	2019-04-24 14:08:16 UTC (rev 7613)
@@ -29,23 +29,5 @@
 
 /* TTMACRO.EXE, main */
 
-/////////////////////////////////////////////////////////////////////////////
-// CCtrlApp:
-
-class CCtrlApp : public CWinApp
-{
-public:
-	CCtrlApp();
-	BOOL Busy;
-
-	//{{AFX_VIRTUAL(CCtrlApp)
-	public:
-	virtual BOOL InitInstance();
-	virtual int ExitInstance();
-	virtual BOOL OnIdle(LONG lCount);
-	//}}AFX_VIRTUAL
-
-	//{{AFX_MSG(CCtrlApp)
-	//}}AFX_MSG
-	DECLARE_MESSAGE_MAP()
-};
+HINSTANCE GetInstance();
+HWND GetHWND();

Modified: branches/ssh_auth_dialog/teraterm/ttpmacro/ttmdlg.cpp
===================================================================
--- branches/ssh_auth_dialog/teraterm/ttpmacro/ttmdlg.cpp	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/teraterm/ttpmacro/ttmdlg.cpp	2019-04-24 14:08:16 UTC (rev 7613)
@@ -29,13 +29,16 @@
 
 /* TTMACRO.EXE, dialog boxes */
 
-#include "stdafx.h"
+#include <windows.h>
+#include <direct.h>
+#include <commdlg.h>
+#include <crtdbg.h>
+#include <assert.h>
+
 #include "teraterm.h"
-#include <direct.h>
 #include "ttm_res.h"
 #include "tttypes.h"
 #include "ttlib.h"
-#include <commdlg.h>
 #include "ttmdef.h"
 #include "errdlg.h"
 #include "inpdlg.h"
@@ -43,8 +46,19 @@
 #include "statdlg.h"
 #include "ListDlg.h"
 #include "ttmlib.h"
+#include "ttmacro.h"
 
-extern "C" {
+#include "ttmdlg.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)
+#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 FileName[MAX_PATH];
 char TopicName[11];
@@ -53,14 +67,12 @@
 int ParamCnt;
 int ParamsSize;
 BOOL SleepFlag;
-}
 
 static int DlgPosX = -10000;
 static int DlgPosY = 0;
 
-static PStatDlg StatDlg = NULL;
+static CStatDlg *StatDlg = NULL;
 
-extern "C" {
 void ParseParam(PBOOL IOption, PBOOL VOption)
 {
 	int dirlen, fnpos;
@@ -69,7 +81,7 @@
 	PCHAR start, cur, next;
 
 	// Get home directory
-	if (GetModuleFileName(AfxGetInstanceHandle(),FileName,sizeof(FileName)) == 0) {
+	if (GetModuleFileName(GetInstance(), FileName,sizeof(FileName)) == 0) {
 		return;
 	}
 	ExtractDirName(FileName,HomeDir);
@@ -157,9 +169,7 @@
 		}
 	}
 }
-}
 
-extern "C" {
 BOOL GetFileName(HWND HWin)
 {
 	char FNFilter[31];
@@ -206,9 +216,7 @@
 		return TRUE;
 	}
 }
-}
 
-extern "C" {
 void SetDlgPos(int x, int y)
 {
 	DlgPosX = x;
@@ -217,9 +225,7 @@
 		StatDlg->Update(NULL,NULL,DlgPosX,DlgPosY);
 	}
 }
-}
 
-extern "C" {
 void OpenInpDlg(PCHAR Buff, PCHAR Text, PCHAR Caption,
                 PCHAR Default, BOOL Paswd)
 {
@@ -226,25 +232,19 @@
 	CInpDlg InpDlg(Buff,Text,Caption,Default,Paswd,DlgPosX,DlgPosY);
 	InpDlg.DoModal();
 }
-}
 
-extern "C" {
 int OpenErrDlg(PCHAR Msg, PCHAR Line, int lineno, int start, int end, PCHAR FileName)
 {
 	CErrDlg ErrDlg(Msg,Line,DlgPosX,DlgPosY, lineno, start, end, FileName);
 	return ErrDlg.DoModal();
 }
-}
 
-extern "C" {
 int OpenMsgDlg(PCHAR Text, PCHAR Caption, BOOL YesNo)
 {
 	CMsgDlg MsgDlg(Text,Caption,YesNo,DlgPosX,DlgPosY);
 	return MsgDlg.DoModal();
 }
-}
 
-extern "C" {
 void OpenStatDlg(PCHAR Text, PCHAR Caption)
 {
 	if (StatDlg==NULL) {
@@ -256,20 +256,18 @@
 		StatDlg->Update(Text,Caption,32767,0);
 	}
 }
-}
 
-extern "C" {
 void CloseStatDlg()
 {
 	if (StatDlg==NULL) {
 		return;
 	}
+	assert(_CrtCheckMemory());
 	StatDlg->DestroyWindow();
+	assert(_CrtCheckMemory());
 	StatDlg = NULL;
 }
-}
 
-extern "C" {
 void BringupStatDlg()
 {
 	if (StatDlg==NULL) {
@@ -277,18 +275,22 @@
 	}
 	StatDlg->Bringup();
 }
-}
 
-extern "C" {
+/**
+ * @retval 0\x88ȏ\xE3	\x91I\x91\xF0\x8D\x80\x96\xDA
+ * @retval -1		cancel\x83{\x83^\x83\x93
+ * @retval -2		close\x83{\x83^\x83\x93
+ */
 int OpenListDlg(PCHAR Text, PCHAR Caption, CHAR **Lists, int Selected)
 {
-	int ret = -1;
+	HINSTANCE hInst = GetInstance();
+	HWND hWnd = GetHWND();
 
 	CListDlg ListDlg(Text, Caption, Lists, Selected, DlgPosX, DlgPosY);
-	if (ListDlg.DoModal() == IDOK) {
-		ret = ListDlg.m_SelectItem;
+	INT_PTR r = ListDlg.DoModal();
+	if (r == IDOK) {
+		return ListDlg.m_SelectItem;
 	}
-	return (ret);
+	return r == IDCANCEL ? -1 : -2;
 }
-}
 

Modified: branches/ssh_auth_dialog/teraterm/ttpmacro/ttmlib.c
===================================================================
--- branches/ssh_auth_dialog/teraterm/ttpmacro/ttmlib.c	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/teraterm/ttpmacro/ttmlib.c	2019-04-24 14:08:16 UTC (rev 7613)
@@ -33,8 +33,11 @@
 #include "ttlib.h"
 #include <string.h>
 #include <direct.h>
-#include <Shlobj.h>
+#include <shlobj.h>
 
+#include "compat_win.h"
+#include "ttmlib.h"
+
 static char CurrentDir[MAXPATHLEN];
 
 typedef struct {
@@ -62,44 +65,62 @@
 	{ NULL,                -1}
 };
 
-void CalcTextExtent(HDC DC, PCHAR Text, LPSIZE s)
+/**
+ * \x95\xB6\x8E\x9A\x82\xF0\x95`\x89悵\x82\xBD\x8E\x9E\x82̃T\x83C\x83Y\x82\xF0\x8EZ\x8Fo\x82\xB7\x82\xE9
+ *	@param[in]	hWnd
+ *	@param[in]	Font	\x83t\x83H\x83\x93\x83g\x83n\x83\x93\x83h\x83\x8B
+ *						NULL\x82̎\x9E\x82\xCDhWnd\x82ɐݒ肳\x82\xEA\x82Ă\xA2\x82\xE9\x83t\x83H\x83\x93\x83g
+ *	@param[in]	Text	\x95`\x89悷\x82\xE9\x83e\x83L\x83X\x83g
+ *	@param[out]	size	\x95`\x89\xE6\x83T\x83C\x83Y(cx,cy)
+ */
+void CalcTextExtent(HWND hWnd, HFONT hFont, const char *Text, LPSIZE s)
 {
-  int W, H, i, i0;
-  char Temp[512];
-  DWORD dwExt;
+	HDC DC = GetDC(hWnd);
+	int W, H, i, i0;
+	char Temp[512];
+	DWORD dwExt;
+	HFONT prevFont;
+	if (hFont == NULL) {
+		hFont = (HFONT)SendMessage(hWnd, WM_GETFONT, 0, 0);
+	}
+	prevFont = (HFONT)SelectObject(DC, hFont);
 
-  W = 0;
-  H = 0;
-  i = 0;
-  do {
-    i0 = i;
-    while ((Text[i]!=0) &&
-	   (Text[i]!=0x0d) &&
-	   (Text[i]!=0x0a))
-      i++;
-    memcpy(Temp,&Text[i0],i-i0);
-    Temp[i-i0] = 0;
-    if (Temp[0]==0)
-    {
-     Temp[0] = 0x20;
-     Temp[1] = 0;
-    }
-    dwExt = GetTabbedTextExtent(DC,Temp,strlen(Temp),0,NULL);
-    s->cx = LOWORD(dwExt);
-    s->cy = HIWORD(dwExt);
-    if (s->cx > W) W = s->cx;
-    H = H + s->cy;
-    if (Text[i]!=0)
-    {
-      i++;
-      if ((Text[i]==0x0a) &&
-	  (Text[i-1]==0x0d))
-	i++;
-    }
-  } while (Text[i]!=0);
-  if ((i-i0 == 0) && (H > s->cy)) H = H - s->cy;
-  s->cx = W;
-  s->cy = H;
+	W = 0;
+	H = 0;
+	i = 0;
+	do {
+		i0 = i;
+		while ((Text[i]!=0) &&
+			   (Text[i]!=0x0d) &&
+			   (Text[i]!=0x0a))
+			i++;
+		memcpy(Temp,&Text[i0],i-i0);
+		Temp[i-i0] = 0;
+		if (Temp[0]==0)
+		{
+			Temp[0] = 0x20;
+			Temp[1] = 0;
+		}
+		dwExt = GetTabbedTextExtent(DC,Temp,strlen(Temp),0,NULL);
+		s->cx = LOWORD(dwExt);
+		s->cy = HIWORD(dwExt);
+		if (s->cx > W) W = s->cx;
+		H = H + s->cy;
+		if (Text[i]!=0)
+		{
+			i++;
+			if ((Text[i]==0x0a) &&
+				(Text[i-1]==0x0d))
+				i++;
+		}
+	} while (Text[i]!=0);
+	if ((i-i0 == 0) && (H > s->cy)) H = H - s->cy;
+	s->cx = W;
+	s->cy = H;
+	if (prevFont != NULL) {
+		SelectObject(DC, prevFont);
+	}
+	ReleaseDC(hWnd, DC);
 }
 
 void TTMGetDir(PCHAR Dir, int destlen)
@@ -216,3 +237,12 @@
 		AttachThreadInput(thisThreadId, fgThreadId, FALSE);
 	}
 }
+
+int MessageBoxHaltScript(HWND hWnd)//, const char *UILanguageFile)
+{
+	char uimsg[MAX_UIMSG];
+	char uimsg2[MAX_UIMSG];
+	get_lang_msg("MSG_MACRO_CONF", uimsg, sizeof(uimsg), "MACRO: confirmation", UILanguageFile);
+	get_lang_msg("MSG_MACRO_HALT_SCRIPT", uimsg2, sizeof(uimsg2), "Are you sure that you want to halt this macro script?", UILanguageFile);
+	return MessageBox(hWnd, uimsg2, uimsg, MB_YESNO | MB_ICONWARNING | MB_DEFBUTTON2);
+}

Modified: branches/ssh_auth_dialog/teraterm/ttpmacro/ttmlib.h
===================================================================
--- branches/ssh_auth_dialog/teraterm/ttpmacro/ttmlib.h	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/teraterm/ttpmacro/ttmlib.h	2019-04-24 14:08:16 UTC (rev 7613)
@@ -29,6 +29,10 @@
 
 // TTMACRO.EXE, misc routines
 
+#pragma once
+
+#include <windows.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -35,7 +39,7 @@
 
 extern char UILanguageFile[MAX_PATH];
 
-void CalcTextExtent(HDC DC, PCHAR Text, LPSIZE s);
+void CalcTextExtent(HWND hWnd, HFONT Font, const char *Text, LPSIZE s);
 void TTMGetDir(PCHAR Dir, int destlen);
 void TTMSetDir(PCHAR Dir);
 int GetAbsPath(PCHAR FName, int destlen);
@@ -42,6 +46,7 @@
 int GetSpecialFolder(PCHAR dest, int dest_len, PCHAR type);
 int GetMonitorLeftmost(int PosX, int PosY);
 void BringupWindow(HWND hWnd);
+int MessageBoxHaltScript(HWND hWnd);
 
 #ifdef __cplusplus
 }

Modified: branches/ssh_auth_dialog/teraterm/ttpmacro/ttmmain.cpp
===================================================================
--- branches/ssh_auth_dialog/teraterm/ttpmacro/ttmmain.cpp	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/teraterm/ttpmacro/ttmmain.cpp	2019-04-24 14:08:16 UTC (rev 7613)
@@ -29,7 +29,10 @@
 
 /* TTMACRO.EXE, main */
 
-#include "stdafx.h"
+#include <windows.h>
+#include <commctrl.h>
+#include <stdio.h>
+
 #include "teraterm.h"
 #include "ttm_res.h"
 #include "ttmdlg.h"
@@ -36,31 +39,59 @@
 #include "ttl.h"
 #include "ttmparse.h"
 #include "ttmdde.h"
-
 #include "ttmmain.h"
 #include "ttmbuff.h"
 #include "ttmlib.h"
-
+#include "dlglib.h"
 #include "ttlib.h"
-
 #include "wait4all.h"
+#include "tmfc.h"
+#include "ttmacro.h"
 
-#ifdef _DEBUG
-#define new DEBUG_NEW
-#undef THIS_FILE
-static char THIS_FILE[] = __FILE__;
-#endif
+static void ClientToScreen(HWND hWnd, RECT *rect)
+{
+	POINT pos;
+	pos.x = rect->left;
+	pos.y = rect->top;
+	::ClientToScreen(hWnd, &pos);
+	rect->left = pos.x;
+	rect->top = pos.y;
 
+	pos.x = rect->right;
+	pos.y = rect->bottom;
+	::ClientToScreen(hWnd, &pos);
+	rect->right = pos.x;
+	rect->bottom = pos.y;
+}
+
+static void ScreenToClient(HWND hWnd, RECT *rect)
+{
+	POINT pos;
+	pos.x = rect->left;
+	pos.y = rect->top;
+	::ScreenToClient(hWnd, &pos);
+	rect->left = pos.x;
+	rect->top = pos.y;
+
+	pos.x = rect->right;
+	pos.y = rect->bottom;
+	::ScreenToClient(hWnd, &pos);
+	rect->right = pos.x;
+	rect->bottom = pos.y;
+}
+
 // CCtrlWindow dialog
 CCtrlWindow::CCtrlWindow()
-	: CDialog()
 {
-	m_hIcon = AfxGetApp()->LoadIcon(IDI_TTMACRO);
+	HINSTANCE hInst = GetInstance();
+	m_hIcon = LoadIcon(hInst, MAKEINTRESOURCE(IDI_TTMACRO));
 }
 
 BOOL CCtrlWindow::Create()
 {
-	if (! CDialog::Create(CCtrlWindow::IDD, NULL)) {
+	HINSTANCE hInst = GetInstance();
+	HWND parent = NULL;
+	if (! TTCDialog::Create(hInst, parent, CCtrlWindow::IDD)) {
 		PostQuitMessage(0);
 		return FALSE;
 	}
@@ -105,7 +136,7 @@
 		// \x8DX\x90V\x91Ώۂ̃}\x83N\x83\x8D\x83R\x83}\x83\x93\x83h\x82̏ꍇ\x82̂݁A\x83E\x83B\x83\x93\x83h\x83E\x82ɍX\x90V\x8Ew\x8E\xA6\x82\xF0\x8Fo\x82\xB7\x81B
 		// \x96\x88\x93x WM_PAINT \x82𑗂\xC1\x82Ă\xA2\x82\xE9\x82ƃ}\x83N\x83\x8D\x82̓\xAE\x8D삪\x92x\x82\xAD\x82Ȃ邽\x82߁B(2006.2.24 yutaka)
 		if (IsUpdateMacroCommand()) {
-			Invalidate(TRUE);
+			::InvalidateRect(m_hWnd, NULL, TRUE);
 		}
 		return TRUE;
 	}
@@ -112,7 +143,7 @@
 	else if (TTLStatus==IdTTLWait) {
 		ResultCode = Wait();
 		if (ResultCode>0) {
-			KillTimer(IdTimeOutTimer);
+			::KillTimer(m_hWnd, IdTimeOutTimer);
 			TTLStatus = IdTTLRun;
 			LockVar();
 			SetResult(ResultCode);
@@ -121,7 +152,7 @@
 			return TRUE;
 		}
 		else if (ComReady==0) {
-			SetTimer(IdTimeOutTimer,0, NULL);
+			::SetTimer(m_hWnd, IdTimeOutTimer,0, NULL);
 		}
 	}
 	else if (TTLStatus==IdTTLWaitLn) {
@@ -133,7 +164,7 @@
 			Temp[0] = 0x0a;
 			Temp[1] = 0;
 			if (CmpWait(ResultCode,Temp)==0) { // new-line is received
-				KillTimer(IdTimeOutTimer);
+				::KillTimer(m_hWnd, IdTimeOutTimer);
 				ClearWait();
 				TTLStatus = IdTTLRun;
 				LockVar();
@@ -148,13 +179,13 @@
 			return TRUE;
 		}
 		else if (ComReady==0) {
-			SetTimer(IdTimeOutTimer,0, NULL);
+			::SetTimer(m_hWnd, IdTimeOutTimer,0, NULL);
 		}
 	}
 	else if (TTLStatus==IdTTLWaitNL) {
 		ResultCode = Wait();
 		if (ResultCode>0) {
-			KillTimer(IdTimeOutTimer);
+			::KillTimer(m_hWnd, IdTimeOutTimer);
 			TTLStatus = IdTTLRun;
 			LockVar();
 			SetInputStr(GetRecvLnBuff());
@@ -162,12 +193,12 @@
 			return TRUE;
 		}
 		else if (ComReady==0) {
-			SetTimer(IdTimeOutTimer,0, NULL);
+			::SetTimer(m_hWnd, IdTimeOutTimer,0, NULL);
 		}
 	}
 	else if (TTLStatus==IdTTLWait2) {
 		if (Wait2()) {
-			KillTimer(IdTimeOutTimer);
+			::KillTimer(m_hWnd, IdTimeOutTimer);
 			TTLStatus = IdTTLRun;
 			LockVar();
 			SetInputStr(Wait2Str);
@@ -176,12 +207,12 @@
 			return TRUE;
 		}
 		else if (ComReady==0) {
-			SetTimer(IdTimeOutTimer,0, NULL);
+			::SetTimer(m_hWnd, IdTimeOutTimer,0, NULL);
 		}
 	}
 	else if (TTLStatus==IdTTLWaitN) {
 		if (WaitN()) {
-			KillTimer(IdTimeOutTimer);
+			::KillTimer(m_hWnd, IdTimeOutTimer);
 			TTLStatus = IdTTLRun;
 			LockVar();
 			SetResult(1);
@@ -191,13 +222,13 @@
 			return TRUE;
 		}
 		else if (ComReady==0) {
-			SetTimer(IdTimeOutTimer,0, NULL);
+			::SetTimer(m_hWnd, IdTimeOutTimer,0, NULL);
 		}
 	}
 	else if (TTLStatus==IdTTLWait4all) {
 		ResultCode = Wait4all();
 		if (ResultCode>0) {
-			KillTimer(IdTimeOutTimer);
+			::KillTimer(m_hWnd, IdTimeOutTimer);
 			TTLStatus = IdTTLRun;
 			LockVar();
 			SetResult(ResultCode);
@@ -206,7 +237,7 @@
 			return TRUE;
 		}
 		else if (ComReady==0) {
-			SetTimer(IdTimeOutTimer,0, NULL);
+			::SetTimer(m_hWnd, IdTimeOutTimer,0, NULL);
 		}
 	}
 
@@ -213,6 +244,7 @@
 	return FALSE;
 }
 
+#if 0
 BEGIN_MESSAGE_MAP(CCtrlWindow, CDialog)
 	//{{AFX_MSG_MAP(CCtrlWindow)
 	ON_WM_CLOSE()
@@ -231,11 +263,16 @@
 	ON_MESSAGE(WM_USER_DDEEND,OnDdeEnd)
 	//}}AFX_MSG_MAP
 END_MESSAGE_MAP()
+#endif
 
 // CCtrlWindow message handler
 
 BOOL CCtrlWindow::OnInitDialog()
 {
+	static const DlgTextInfo TextInfos[] = {
+		{ IDC_CTRLPAUSESTART, "BTN_PAUSE" },
+		{ IDC_CTRLEND, "BTN_END" },
+	};
 	HDC TmpDC;
 	int CRTWidth, CRTHeight;
 	RECT Rect;
@@ -242,35 +279,20 @@
 	char Temp[MAX_PATH + 8]; // MAX_PATH + "MACRO - "(8)
 	BOOL IOption, VOption;
 	int CmdShow;
-	char uimsg[MAX_UIMSG], uimsg2[MAX_UIMSG];
-	LOGFONT logfont;
-	HFONT font;
 	int fuLoad = LR_DEFAULTCOLOR;
 	RECT rc_dlg, rc_filename, rc_lineno;
 	LONG dlg_len, len;
+	HINSTANCE hInst = GetInstance();
 
-	CDialog::OnInitDialog();
+	SetDlgTexts(m_hWnd, TextInfos, _countof(TextInfos), UILanguageFile);
 
-	font = (HFONT)SendMessage(WM_GETFONT, 0, 0);
-	GetObject(font, sizeof(LOGFONT), &logfont);
-	if (get_lang_font("DLG_SYSTEM_FONT", m_hWnd, &logfont, &DlgFont, UILanguageFile)) {
-		SendDlgItemMessage(IDC_CTRLPAUSESTART, WM_SETFONT, (WPARAM)DlgFont, MAKELPARAM(TRUE,0));
-		SendDlgItemMessage(IDC_CTRLEND, WM_SETFONT, (WPARAM)DlgFont, MAKELPARAM(TRUE,0));
-	}
-
-	GetDlgItemText(IDC_CTRLPAUSESTART, uimsg2, sizeof(uimsg2));
-	get_lang_msg("BTN_PAUSE", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-	SetDlgItemText(IDC_CTRLPAUSESTART, uimsg);
-	GetDlgItemText(IDC_CTRLEND, uimsg2, sizeof(uimsg2));
-	get_lang_msg("BTN_END", uimsg, sizeof(uimsg), uimsg2, UILanguageFile);
-	SetDlgItemText(IDC_CTRLEND, uimsg);
-
 	Pause = FALSE;
 
+	// \x83Z\x83\x93\x83^\x81[\x82Ɏ\x9D\x82\xC1\x82Ă\xA2\x82\xAD
 	TmpDC = ::GetDC(GetSafeHwnd());
-	CRTWidth = GetDeviceCaps(TmpDC,HORZRES);
-	CRTHeight = GetDeviceCaps(TmpDC,VERTRES);
-	GetWindowRect(&Rect);
+	CRTWidth = ::GetDeviceCaps(TmpDC,HORZRES);
+	CRTHeight = ::GetDeviceCaps(TmpDC,VERTRES);
+	::GetWindowRect(m_hWnd, &Rect);
 	::ReleaseDC(GetSafeHwnd(), TmpDC);
 	::SetWindowPos(GetSafeHwnd(),HWND_TOP,
 	               (CRTWidth-Rect.right+Rect.left) / 2,
@@ -281,11 +303,11 @@
 		fuLoad = LR_VGACOLOR;
 	}
 	::PostMessage(GetSafeHwnd(),WM_SETICON,ICON_SMALL,
-	              (LPARAM)LoadImage(AfxGetInstanceHandle(),
+	              (LPARAM)LoadImage(hInst,
 	                                MAKEINTRESOURCE(IDI_TTMACRO),
 	                                IMAGE_ICON,16,16,fuLoad));
 	::PostMessage(GetSafeHwnd(),WM_SETICON,ICON_BIG,
-	              (LPARAM)LoadImage(AfxGetInstanceHandle(),
+	              (LPARAM)LoadImage(hInst,
 	                                MAKEINTRESOURCE(IDI_TTMACRO),
 	                                IMAGE_ICON,0,0,fuLoad));
 
@@ -325,20 +347,20 @@
 	 * (2015.1.2 yutaka)
 	 */
 	// \x8C\xBB\x8D݃T\x83C\x83Y\x82\xA9\x82\xE7\x95K\x97v\x82Ȓl\x82\xF0\x8Cv\x8EZ
-	GetClientRect(&rc_dlg);
-	ClientToScreen(&rc_dlg);
+	::GetClientRect(m_hWnd, &rc_dlg);
+	ClientToScreen(m_hWnd, &rc_dlg);
 	dlg_len = rc_dlg.right - rc_dlg.left;
 
-	GetDlgItem(IDC_FILENAME)->GetWindowRect(&rc_filename);
+	::GetWindowRect(GetDlgItem(IDC_FILENAME), &rc_filename);
 	len = rc_filename.right - rc_filename.left;
 	m_filename_ratio = len*100 / dlg_len;
 
-	GetDlgItem(IDC_LINENO)->GetWindowRect(&rc_lineno);
+	::GetWindowRect(GetDlgItem(IDC_LINENO), &rc_lineno);
 	len = rc_lineno.right - rc_lineno.left;
 	m_lineno_ratio = len * 100 / dlg_len;
 
 	// \x83\x8A\x83T\x83C\x83Y\x83A\x83C\x83R\x83\x93\x82\xF0\x89E\x89\xBA\x82ɕ\\x8E\xA6\x82\xB3\x82\xB9\x82\xBD\x82\xA2\x82̂ŁA\x83X\x83e\x81[\x83^\x83X\x83o\x81[\x82\xF0\x95t\x82\xAF\x82\xE9\x81B
-	m_hStatus = CreateStatusWindow(
+	m_hStatus = ::CreateStatusWindow(
 		WS_CHILD | WS_VISIBLE |
 		CCS_BOTTOM | SBARS_SIZEGRIP, NULL, GetSafeHwnd(), 1);
 
@@ -356,10 +378,13 @@
 	return TRUE;
 }
 
-void CCtrlWindow::OnCancel( )
+BOOL CCtrlWindow::OnCancel( )
 {
+#if 1
 	::DestroyWindow(m_hStatus);
 	DestroyWindow();
+#endif
+	return TRUE;	// cancel(ESC\x89\x9F\x89\xBA)\x82𖳎\x8B
 }
 
 BOOL CCtrlWindow::OnCommand(WPARAM wParam, LPARAM lParam)
@@ -367,30 +392,31 @@
 	char uimsg[MAX_UIMSG];
 
 	switch (LOWORD(wParam)) {
-		case IDC_CTRLPAUSESTART:
-			if (Pause) {
-				get_lang_msg("BTN_PAUSE", uimsg, sizeof(uimsg),  "Pau&se", UILanguageFile);
-				SetDlgItemText(IDC_CTRLPAUSESTART, uimsg);
-			}
-			else {
-				get_lang_msg("BTN_START", uimsg, sizeof(uimsg),  "&Start", UILanguageFile);
-				SetDlgItemText(IDC_CTRLPAUSESTART, uimsg);
-			}
-			Pause = ! Pause;
-			return TRUE;
-		case IDC_CTRLEND:
-			TTLStatus = IdTTLEnd;
-			return TRUE;
-		default:
-			return (CDialog::OnCommand(wParam,lParam));
+	case IDC_CTRLPAUSESTART:
+		if (Pause) {
+			get_lang_msg("BTN_PAUSE", uimsg, sizeof(uimsg),  "Pau&se", UILanguageFile);
+			SetDlgItemText(IDC_CTRLPAUSESTART, uimsg);
+		}
+		else {
+			get_lang_msg("BTN_START", uimsg, sizeof(uimsg),  "&Start", UILanguageFile);
+			SetDlgItemText(IDC_CTRLPAUSESTART, uimsg);
+		}
+		Pause = ! Pause;
+		return TRUE;
+	case IDC_CTRLEND:
+		TTLStatus = IdTTLEnd;
+		PostQuitMessage(0);
+		return TRUE;
+	default:
+		return FALSE;
 	}
 }
 
-void CCtrlWindow::OnClose()
+BOOL CCtrlWindow::OnClose()
 {
 	EndTTL();
 	EndDDE();
-	CDialog::OnClose();
+	return TRUE;
 }
 
 void CCtrlWindow::OnDestroy()
@@ -399,17 +425,17 @@
 
 	EndTTL();
 	EndDDE();
-	CDialog::OnDestroy();
+//	CDialog::OnDestroy();
 }
 
 // for icon drawing in Win NT 3.5
-BOOL CCtrlWindow::OnEraseBkgnd(CDC* pDC)
+BOOL CCtrlWindow::OnEraseBkgnd(HDC DC)
 {
-	if (IsIconic()) {
+	if (::IsIconic(m_hWnd)) {
 		return TRUE;
 	}
 	else {
-		return CDialog::OnEraseBkgnd(pDC);
+		return FALSE;
 	}
 }
 
@@ -416,10 +442,12 @@
 // for icon drawing in Win NT 3.5
 void CCtrlWindow::OnPaint()
 {
-	int OldMapMode;
-	CPaintDC dc(this);
+	PAINTSTRUCT ps;
+	HDC dc;
 	char buf[128];
 
+	dc = BeginPaint(&ps);
+
 	// line number (2005.7.18 yutaka)
 	// added line buffer (2005.7.22 yutaka)
 	// added MACRO filename (2013.9.8 yutaka)
@@ -428,13 +456,15 @@
 	_snprintf_s(buf, sizeof(buf), _TRUNCATE, ":%d:%s", GetLineNo(), GetLineBuffer());
 	SetDlgItemText(IDC_LINENO, buf);
 
-	OldMapMode = dc.GetMapMode();
-	dc.SetMapMode(MM_TEXT);
+	if (::IsIconic(m_hWnd)) {
+		int OldMapMode = GetMapMode(dc);
+		SetMapMode(dc, MM_TEXT);
+		SendMessage(WM_ICONERASEBKGND,(UINT)dc, 0);	// TODO
+		DrawIcon(dc, 0, 0, m_hIcon);
+		SetMapMode(dc, OldMapMode);
+	}
 
-	if (!IsIconic()) return;
-	SendMessage(WM_ICONERASEBKGND,(UINT)(dc.m_hDC));
-	dc.DrawIcon(0, 0, m_hIcon);
-	dc.SetMapMode(OldMapMode);
+	EndPaint(&ps);
 }
 
 // \x83}\x83N\x83\x8D\x83E\x83B\x83\x93\x83h\x83E\x82\xF0\x83\x8A\x83T\x83C\x83Y\x89\\x82Ƃ\xB7\x82邽\x82߂ɁAOnSize\x83n\x83\x93\x83h\x83\x89\x82\xF0override\x82\xB7\x82\xE9\x81B
@@ -445,16 +475,17 @@
 	LONG new_w, new_h, new_x, new_y;
 	LONG len;
 
-	GetClientRect(&rc_dlg);
-	ClientToScreen(&rc_dlg);
+	::GetClientRect(m_hWnd, &rc_dlg);
+	ClientToScreen(m_hWnd, &rc_dlg);
 	len = rc_dlg.right - rc_dlg.left;
 
 	// TTL\x83t\x83@\x83C\x83\x8B\x96\xBC\x82̍Ĕz\x92u
-	GetDlgItem(IDC_FILENAME)->GetWindowRect(&rc_filename);
-	ScreenToClient(&rc_filename);
+	HWND hWnd = GetDlgItem(IDC_FILENAME);
+	::GetWindowRect(hWnd, &rc_filename);
+	ScreenToClient(m_hWnd, &rc_filename);
 	new_w = (len * m_filename_ratio) / 100;
 	new_h = rc_filename.bottom - rc_filename.top;
-	GetDlgItem(IDC_FILENAME)->SetWindowPos(&CWnd::wndBottom,
+	::SetWindowPos(hWnd, HWND_BOTTOM,
 		0, 0, new_w, new_h,
 		SWP_NOMOVE | SWP_NOZORDER
 	);
@@ -461,18 +492,19 @@
 	new_x = rc_filename.left + new_w;
 
 	// \x8Ds\x94ԍ\x86\x82̍Ĕz\x92u
-	GetDlgItem(IDC_LINENO)->GetWindowRect(&rc_lineno);
-	ScreenToClient(&rc_lineno);
+	hWnd = GetDlgItem(IDC_LINENO);
+	::GetWindowRect(hWnd, &rc_lineno);
+	ScreenToClient(m_hWnd, &rc_lineno);
 	new_w = (len * m_lineno_ratio) / 100;
 	new_h = rc_lineno.bottom - rc_lineno.top;
 	new_y = rc_lineno.top;
-	GetDlgItem(IDC_LINENO)->SetWindowPos(&CWnd::wndBottom,
+	::SetWindowPos(hWnd, HWND_BOTTOM,
 		new_x, new_y, new_w, new_h,
 		SWP_NOZORDER
 		);
 
 	// status bar
-	::SendMessage(m_hStatus, WM_SIZE, cx, cy);
+	::SendMessage(m_hStatus, WM_SIZE, nType, (cy<<16)|cx );
 }
 
 // \x83}\x83N\x83\x8D\x83E\x83B\x83\x93\x83h\x83E\x82\xF0\x83\x8A\x83T\x83C\x83Y\x89\\x82Ƃ\xB7\x82邽\x82߂ɁAOnGetMinMaxInfo\x83n\x83\x93\x83h\x83\x89\x82\xF0override\x82\xB7\x82\xE9\x81B
@@ -497,16 +529,18 @@
 	return m_hIcon;
 }
 
+#if 0
 void CCtrlWindow::OnSysColorChange()
 {
 	CDialog::OnSysColorChange();
 }
+#endif
 
-void CCtrlWindow::OnTimer(UINT nIDEvent)
+void CCtrlWindow::OnTimer(UINT_PTR nIDEvent)
 {
 	BOOL TimeOut;
 
-	KillTimer(nIDEvent);
+	::KillTimer(m_hWnd, nIDEvent);
 	if (nIDEvent!=IdTimeOutTimer) {
 		return;
 	}
@@ -576,15 +610,17 @@
 		return;
 	}
 
-	SetTimer(IdTimeOutTimer, TIMEOUT_TIMER_MS, NULL);
+	::SetTimer(m_hWnd, IdTimeOutTimer, TIMEOUT_TIMER_MS, NULL);
 }
 
-void CCtrlWindow::PostNcDestroy()
+BOOL CCtrlWindow::PostNcDestroy()
 {
 	delete this;
 	PostQuitMessage(0);
+	return TRUE;
 }
 
+#if 0
 BOOL CCtrlWindow::PreTranslateMessage(MSG* pMsg)
 {
 	if ((pMsg->message==WM_KEYDOWN) && (pMsg->wParam==VK_ESCAPE)) { // ignore ESC key
@@ -592,8 +628,9 @@
 	}
 	return CDialog::PreTranslateMessage(pMsg);
 }
+#endif
 
-LONG CCtrlWindow::OnDdeCmndEnd(UINT wParam, LONG lParam)
+LRESULT CCtrlWindow::OnDdeCmndEnd(WPARAM wParam, LPARAM lParam)
 {
 	if (TTLStatus == IdTTLWaitCmndResult) {
 		LockVar();
@@ -608,7 +645,7 @@
 	return 0;
 }
 
-LONG CCtrlWindow::OnDdeComReady(UINT wParam, LONG lParam)
+LRESULT CCtrlWindow::OnDdeComReady(WPARAM wParam, LPARAM lParam)
 {
 	ComReady = wParam;
 	if ((TTLStatus == IdTTLWait) ||
@@ -617,7 +654,7 @@
 	    (TTLStatus == IdTTLWait2) ||
 	    (TTLStatus == IdTTLWaitN)) {
 		if (ComReady==0) {
-			SetTimer(IdTimeOutTimer,0, NULL);
+			::SetTimer(m_hWnd, IdTimeOutTimer,0, NULL);
 		}
 	}
 	else if (TTLStatus==IdTTLSleep) {
@@ -644,7 +681,7 @@
 	return 0;
 }
 
-LONG CCtrlWindow::OnDdeReady(UINT wParam, LONG lParam)
+LRESULT CCtrlWindow::OnDdeReady(WPARAM wParam, LPARAM lParam)
 {
 	if (TTLStatus != IdTTLInitDDE) {
 		return 0;
@@ -662,7 +699,7 @@
 	return 0;
 }
 
-LONG CCtrlWindow::OnDdeEnd(UINT wParam, LONG lParam)
+LRESULT CCtrlWindow::OnDdeEnd(WPARAM wParam, LPARAM lParam)
 {
 	EndDDE();
 	if ((TTLStatus == IdTTLWaitCmndEnd) ||
@@ -674,7 +711,7 @@
 	         (TTLStatus == IdTTLWaitNL) ||
 	         (TTLStatus == IdTTLWait2) ||
 	         (TTLStatus == IdTTLWaitN)) {
-		SetTimer(IdTimeOutTimer,0, NULL);
+		::SetTimer(m_hWnd, IdTimeOutTimer,0, NULL);
 	}
 	else if (TTLStatus==IdTTLSleep) {
 		LockVar();
@@ -691,7 +728,7 @@
 	return 0;
 }
 
-LONG CCtrlWindow::OnMacroBringup(UINT wParam, LONG lParam)
+LRESULT CCtrlWindow::OnMacroBringup(WPARAM wParam, LPARAM lParam)
 {
 	DWORD pid;
 	DWORD thisThreadId;
@@ -701,13 +738,64 @@
 	fgThreadId = GetWindowThreadProcessId(::GetForegroundWindow(), &pid);
 
 	if (thisThreadId == fgThreadId) {
-		SetForegroundWindow();
-		BringWindowToTop();
+		::SetForegroundWindow(m_hWnd);
+		::BringWindowToTop(m_hWnd);
 	} else {
 		AttachThreadInput(thisThreadId, fgThreadId, TRUE);
-		SetForegroundWindow();
-		BringWindowToTop();
+		::SetForegroundWindow(m_hWnd);
+		::BringWindowToTop(m_hWnd);
 		AttachThreadInput(thisThreadId, fgThreadId, FALSE);
 	}
 	return 0;
 }
+
+LRESULT CCtrlWindow::DlgProc(UINT msg, WPARAM wp, LPARAM lp)
+{
+	switch(msg)
+	{
+#if 0	// tmfc\x82ŏ\x88\x97\x9D\x82\xB3\x82\xEA\x82\xE9
+	case WM_CLOSE:
+		OnClose();
+		break;
+#endif
+	case WM_DESTROY:
+		OnDestroy();
+		PostQuitMessage(0);
+		break;
+	case WM_ERASEBKGND:
+		OnEraseBkgnd((HDC)wp);
+		break;
+	case WM_PAINT:
+		OnPaint();
+		break;
+	case WM_SIZE:
+		OnSize(wp, LOWORD(lp), HIWORD(lp));
+		break;
+	case WM_GETMINMAXINFO:
+		OnGetMinMaxInfo((MINMAXINFO *)lp);
+		break;
+#if 0
+	case WM_QUERYDRAGICON:
+	case WM_SYSCOLORCHANGE:
+#endif
+	case WM_TIMER:
+		OnTimer(wp);
+		break;
+	case WM_USER_DDECMNDEND:
+		OnDdeCmndEnd(wp, lp);
+		break;
+	case WM_USER_DDECOMREADY:
+		OnDdeComReady(wp, lp);
+		break;
+	case WM_USER_DDEREADY:
+		OnDdeReady(wp, lp);
+		break;
+	case WM_USER_MACROBRINGUP:
+		OnMacroBringup(wp, lp);
+		break;
+	case WM_USER_DDEEND:
+		OnDdeEnd(wp, lp);
+		break;
+	}
+	return FALSE;
+}

Modified: branches/ssh_auth_dialog/teraterm/ttpmacro/ttmmain.h
===================================================================
--- branches/ssh_auth_dialog/teraterm/ttpmacro/ttmmain.h	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/teraterm/ttpmacro/ttmmain.h	2019-04-24 14:08:16 UTC (rev 7613)
@@ -29,12 +29,13 @@
 
 /* TTMACRO.EXE, main window */
 
+#include "tmfc.h"
 #include "ttmmsg.h"
 #include "tttypes.h"
 /////////////////////////////////////////////////////////////////////////////
 // CCtrlWindow dialog
 
-class CCtrlWindow : public CDialog
+class CCtrlWindow : public TTCDialog
 {
 public:
 	BOOL Pause;
@@ -49,11 +50,13 @@
 
 	//{{AFX_VIRTUAL(CCtrlWindow)
 	protected:
-	virtual void OnCancel( );
+	virtual BOOL OnCancel( );
 	virtual BOOL OnCommand(WPARAM wParam, LPARAM lParam);
-	virtual void PostNcDestroy();
-	virtual BOOL PreTranslateMessage(MSG* pMsg);
+	virtual BOOL PostNcDestroy();
+	virtual BOOL OnInitDialog();
+	//	virtual BOOL PreTranslateMessage(MSG* pMsg);		// TODO
 	//}}AFX_VIRTUAL
+	virtual LRESULT DlgProc(UINT msg, WPARAM wp, LPARAM lp);
 
 protected:
 	HICON m_hIcon;
@@ -64,23 +67,22 @@
 	HWND m_hStatus;
 
 	//{{AFX_MSG(CCtrlWindow)
-	virtual BOOL OnInitDialog();
-	afx_msg void OnClose();
+#define afx_msg
+	afx_msg BOOL OnClose();
 	afx_msg void OnDestroy();
-	afx_msg BOOL OnEraseBkgnd(CDC* pDC);
+	afx_msg BOOL OnEraseBkgnd(HDC DC);
 	afx_msg void OnPaint();
 	afx_msg void OnSize(UINT nType, int cx, int cy);
 	afx_msg void OnGetMinMaxInfo(MINMAXINFO* lpMMI);
 	afx_msg HCURSOR OnQueryDragIcon();
 	afx_msg void OnSysColorChange();
-	afx_msg void OnTimer(UINT nIDEvent);
-	afx_msg LONG OnDdeCmndEnd(UINT wParam, LONG lParam);
-	afx_msg LONG OnDdeComReady(UINT wParam, LONG lParam);
-	afx_msg LONG OnDdeReady(UINT wParam, LONG lParam);
-	afx_msg LONG OnDdeEnd(UINT wParam, LONG lParam);
-	afx_msg LONG OnMacroBringup(UINT wParam, LONG lParam);
+	afx_msg void OnTimer(UINT_PTR nIDEvent);
+	afx_msg LRESULT OnDdeCmndEnd(WPARAM wParam, LPARAM lParam);
+	afx_msg LRESULT OnDdeComReady(WPARAM wParam, LPARAM lParam);
+	afx_msg LRESULT OnDdeReady(WPARAM wParam, LPARAM lParam);
+	afx_msg LRESULT OnDdeEnd(WPARAM wParam, LPARAM lParam);
+	afx_msg LRESULT OnMacroBringup(WPARAM wParam, LPARAM lParam);
 	//}}AFX_MSG
-	DECLARE_MESSAGE_MAP()
+//	DECLARE_MESSAGE_MAP()
 };
 
-typedef CCtrlWindow *PCtrlWindow;

Modified: branches/ssh_auth_dialog/teraterm/ttpmacro/ttmparse.c
===================================================================
--- branches/ssh_auth_dialog/teraterm/ttpmacro/ttmparse.c	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/teraterm/ttpmacro/ttmparse.c	2019-04-24 14:08:16 UTC (rev 7613)
@@ -33,10 +33,17 @@
 #include <string.h>
 #include <stdio.h>
 #include <ctype.h>
+#include <crtdbg.h>
 #include "ttmdlg.h"
 #include "ttmparse.h"
 #include "ttmbuff.h"
 
+#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
+
 /* C\x8C\xBE\x8C\xEA\x83X\x83^\x83C\x83\x8B\x82̃R\x83\x81\x83\x93\x83g\x82\xF0\x83T\x83|\x81[\x83g\x82\xB7\x82邩\x82ǂ\xA4\x82\xA9 (2009.7.2 yutaka) */
 #define SUPPORT_C_STYLE_COMMENT
 static int commenting = 0;   /* C\x8C\xBE\x8C\xEA\x83R\x83\x81\x83\x93\x83g */

Deleted: branches/ssh_auth_dialog/teraterm/ttpmacro/ttpmacro.dsp
===================================================================
--- branches/ssh_auth_dialog/teraterm/ttpmacro/ttpmacro.dsp	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/teraterm/ttpmacro/ttpmacro.dsp	2019-04-24 14:08:16 UTC (rev 7613)
@@ -1,226 +0,0 @@
-# Microsoft Developer Studio Project File - Name="ttpmacro" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 5.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Application" 0x0101
-
-CFG=ttpmacro - Win32 Release
-!MESSAGE NMAKE /f "ttpmacro.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE on this makefile
-!MESSAGE by defining the macro CFG on the command line.  For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "ttpmacro.mak" CFG="ttpmacro - Win32 Release"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "ttpmacro - Win32 Release" ("Win32 (x86) Application")
-!MESSAGE "ttpmacro - Win32 Debug" ("Win32 (x86) Application")
-!MESSAGE 
-
-# Begin Project
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "ttpmacro - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Release"
-# PROP BASE Intermediate_Dir ".\Release"
-# PROP BASE Target_Dir "."
-# PROP Use_MFC 1
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\bin\Release"
-# PROP Intermediate_Dir ".\Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "."
-# ADD BASE CPP /nologo /W3 /GX /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\..\source\common" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX"teraterm.h" /FD /c
-# ADD BASE MTL /nologo /D "NDEBUG" /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x411 /d "NDEBUG"
-# ADD RSC /l 0x409 /i "..\..\source\common" /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386
-# ADD LINK32 /nologo /subsystem:windows /machine:I386
-
-!ELSEIF  "$(CFG)" == "ttpmacro - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Debug"
-# PROP BASE Intermediate_Dir ".\Debug"
-# PROP BASE Target_Dir "."
-# PROP Use_MFC 1
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\bin\Debug"
-# PROP Intermediate_Dir ".\Debug"
-# PROP Target_Dir "."
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\..\source\common" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX"teraterm.h" /FD /c
-# ADD BASE MTL /nologo /D "_DEBUG" /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x411 /d "_DEBUG"
-# ADD RSC /l 0x409 /i "..\..\source\common" /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386
-# ADD LINK32 /nologo /subsystem:windows /debug /machine:I386
-
-!ENDIF 
-
-# Begin Target
-
-# Name "ttpmacro - Win32 Release"
-# Name "ttpmacro - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=..\..\source\ttmacro\errdlg.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\source\ttmacro\inpdlg.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\source\ttmacro\msgdlg.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\source\ttmacro\statdlg.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\Source\Common\stdafx.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\source\ttmacro\ttmacro.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\source\ttmacro\ttmdlg.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\source\ttmacro\ttmmain.cpp
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"
-# Begin Source File
-
-SOURCE=..\..\source\ttmacro\errdlg.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\source\ttmacro\inpdlg.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\source\ttmacro\msgdlg.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\source\ttmacro\statdlg.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\source\ttmacro\ttl.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\source\common\ttlib.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\source\ttmacro\ttmacro.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\source\ttmacro\ttmbuff.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\source\ttmacro\ttmdde.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\source\ttmacro\ttmdlg.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\source\ttmacro\ttmenc.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\source\ttmacro\ttmmain.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\source\ttmacro\ttmparse.h
-# End Source File
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe"
-# Begin Source File
-
-SOURCE=..\..\Source\Ttmacro\Ttmacro.ico
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\Source\Ttmacro\ttpmacro.rc
-# ADD BASE RSC /l 0x411 /i "\DEV\TERATERM\Source\Ttmacro"
-# SUBTRACT BASE RSC /i "..\..\source\common"
-# ADD RSC /l 0x411 /i "\DEV\TERATERM\Source\Ttmacro" /i "C:\DEV\TERATERM\source\ttmacro"
-# SUBTRACT RSC /i "..\..\source\common"
-# End Source File
-# End Group
-# Begin Group "Source Files (C)"
-
-# PROP Default_Filter "c"
-# Begin Source File
-
-SOURCE=..\..\Source\Ttmacro\ttl.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\Source\Common\ttlib.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\Source\Ttmacro\ttmbuff.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\Source\Ttmacro\ttmdde.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\Source\Ttmacro\ttmenc.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\Source\Ttmacro\ttmlib.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\Source\Ttmacro\ttmparse.c
-# End Source File
-# End Group
-# End Target
-# End Project

Modified: branches/ssh_auth_dialog/teraterm/ttpmacro/ttpmacro.rc
===================================================================
--- branches/ssh_auth_dialog/teraterm/ttpmacro/ttpmacro.rc	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/teraterm/ttpmacro/ttpmacro.rc	2019-04-24 14:08:16 UTC (rev 7613)
@@ -1,6 +1,8 @@
 // Microsoft Visual C++ generated resource script.
 //
+#include <windows.h>
 #include "ttm_res.h"
+#define IDC_STATIC 0
 
 #define APSTUDIO_READONLY_SYMBOLS
 /////////////////////////////////////////////////////////////////////////////
@@ -7,7 +9,7 @@
 //
 // Generated from the TEXTINCLUDE 2 resource.
 //
-#include "afxres.h"
+//#include "afxres.h"
 
 /////////////////////////////////////////////////////////////////////////////
 #undef APSTUDIO_READONLY_SYMBOLS
@@ -91,7 +93,7 @@
 BEGIN
     DEFPUSHBUTTON   "OK",IDOK,0,31,35,12
     LTEXT           "",IDC_MSGTEXT,0,8,65,9,SS_NOPREFIX
-    PUSHBUTTON      "No",IDCLOSE,45,31,35,12,NOT WS_VISIBLE
+    PUSHBUTTON      "No",IDCANCEL,45,31,35,12,NOT WS_VISIBLE
 END
 
 IDD_STATDLG DIALOGEX 0, 0, 52, 25
@@ -108,8 +110,8 @@
 BEGIN
     DEFPUSHBUTTON   "OK",IDOK,129,7,50,14
     PUSHBUTTON      "Cancel",IDCANCEL,129,24,50,14
-    LISTBOX         IDC_LISTBOX,7,7,104,49,LBS_SORT | LBS_USETABSTOPS | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
-    LTEXT           "Static",IDC_STATIC,7,63,172,15
+    LISTBOX         IDC_LISTBOX,7,7,104,49,LBS_USETABSTOPS | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
+    LTEXT           "Static",IDC_LISTTEXT,7,63,172,15
 END
 
 

Modified: branches/ssh_auth_dialog/teraterm/ttpmacro/ttpmacro.v10.vcxproj
===================================================================
--- branches/ssh_auth_dialog/teraterm/ttpmacro/ttpmacro.v10.vcxproj	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/teraterm/ttpmacro/ttpmacro.v10.vcxproj	2019-04-24 14:08:16 UTC (rev 7613)
@@ -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" />

Modified: branches/ssh_auth_dialog/teraterm/ttpmacro/ttpmacro.v11.vcxproj
===================================================================
--- branches/ssh_auth_dialog/teraterm/ttpmacro/ttpmacro.v11.vcxproj	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/teraterm/ttpmacro/ttpmacro.v11.vcxproj	2019-04-24 14:08:16 UTC (rev 7613)
@@ -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,7 +177,7 @@
     <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" />

Modified: branches/ssh_auth_dialog/teraterm/ttpmacro/ttpmacro.v12.vcxproj
===================================================================
--- branches/ssh_auth_dialog/teraterm/ttpmacro/ttpmacro.v12.vcxproj	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/teraterm/ttpmacro/ttpmacro.v12.vcxproj	2019-04-24 14:08:16 UTC (rev 7613)
@@ -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" />

Modified: branches/ssh_auth_dialog/teraterm/ttpmacro/ttpmacro.v14.vcxproj
===================================================================
--- branches/ssh_auth_dialog/teraterm/ttpmacro/ttpmacro.v14.vcxproj	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/teraterm/ttpmacro/ttpmacro.v14.vcxproj	2019-04-24 14:08:16 UTC (rev 7613)
@@ -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" />

Modified: branches/ssh_auth_dialog/teraterm/ttpmacro/ttpmacro.v15.vcxproj
===================================================================
--- branches/ssh_auth_dialog/teraterm/ttpmacro/ttpmacro.v15.vcxproj	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/teraterm/ttpmacro/ttpmacro.v15.vcxproj	2019-04-24 14:08:16 UTC (rev 7613)
@@ -21,12 +21,12 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <PlatformToolset>v141</PlatformToolset>
-    <UseOfMfc>Static</UseOfMfc>
+    <UseOfMfc>false</UseOfMfc>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <PlatformToolset>v141</PlatformToolset>
-    <UseOfMfc>Static</UseOfMfc>
+    <UseOfMfc>false</UseOfMfc>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -81,7 +81,7 @@
       <AdditionalIncludeDirectories>$(SolutionDir)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>
@@ -88,7 +88,6 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX86</TargetMachine>
-      <IgnoreSpecificDefaultLibraries>nafxcw.lib;LIBCMT.lib</IgnoreSpecificDefaultLibraries>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -118,7 +117,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>
@@ -125,13 +124,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" />
@@ -153,6 +157,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" />
@@ -162,7 +170,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" />

Modified: branches/ssh_auth_dialog/teraterm/ttpmacro/ttpmacro.v15.vcxproj.filters
===================================================================
--- branches/ssh_auth_dialog/teraterm/ttpmacro/ttpmacro.v15.vcxproj.filters	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/teraterm/ttpmacro/ttpmacro.v15.vcxproj.filters	2019-04-24 14:08:16 UTC (rev 7613)
@@ -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,6 +165,18 @@
     <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">

Copied: branches/ssh_auth_dialog/teraterm/ttpmacro/ttpmacro.v16.vcxproj (from rev 7520, branches/ssh_auth_dialog/teraterm/ttpmacro/ttpmacro.v15.vcxproj)
===================================================================
--- branches/ssh_auth_dialog/teraterm/ttpmacro/ttpmacro.v16.vcxproj	                        (rev 0)
+++ branches/ssh_auth_dialog/teraterm/ttpmacro/ttpmacro.v16.vcxproj	2019-04-24 14:08:16 UTC (rev 7613)
@@ -0,0 +1,209 @@
+<?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" />
+  </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.v15.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/ssh_auth_dialog/teraterm/ttpmacro/ttpmacro.v16.vcxproj.filters (from rev 7520, branches/ssh_auth_dialog/teraterm/ttpmacro/ttpmacro.v15.vcxproj.filters)
===================================================================
--- branches/ssh_auth_dialog/teraterm/ttpmacro/ttpmacro.v16.vcxproj.filters	                        (rev 0)
+++ branches/ssh_auth_dialog/teraterm/ttpmacro/ttpmacro.v16.vcxproj.filters	2019-04-24 14:08:16 UTC (rev 7613)
@@ -0,0 +1,194 @@
+<?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>
+  </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/ssh_auth_dialog/teraterm/ttpmacro/ttpmacro.v9.vcproj
===================================================================
--- branches/ssh_auth_dialog/teraterm/ttpmacro/ttpmacro.v9.vcproj	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/teraterm/ttpmacro/ttpmacro.v9.vcproj	2019-04-24 14:08:16 UTC (rev 7613)
@@ -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,6 +207,26 @@
 				>
 			</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>
@@ -229,10 +247,14 @@
 				>
 			</File>
 			<File
-				RelativePath="..\common\stdafx.cpp"
+				RelativePath="..\common\tmfc.cpp"
 				>
 			</File>
 			<File
+				RelativePath="..\common\tmfc_frame.cpp"
+				>
+			</File>
+			<File
 				RelativePath="ttmacro.cpp"
 				>
 			</File>
@@ -254,6 +276,14 @@
 				>
 			</File>
 			<File
+				RelativePath="..\common\compat_win.h"
+				>
+			</File>
+			<File
+				RelativePath="..\common\dllutil.h"
+				>
+			</File>
+			<File
 				RelativePath="errdlg.h"
 				>
 			</File>
@@ -282,6 +312,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\common\tmfc.h"
+				>
+			</File>
+			<File
 				RelativePath="..\common\ttddecmnd.h"
 				>
 			</File>
@@ -351,6 +385,10 @@
 				>
 			</File>
 			<File
+				RelativePath="ttmacro_3d.ico"
+				>
+			</File>
+			<File
 				RelativePath="ttpmacro.rc"
 				>
 				<FileConfiguration
@@ -378,6 +416,10 @@
 			Filter="c"
 			>
 			<File
+				RelativePath="fileread.cpp"
+				>
+			</File>
+			<File
 				RelativePath="..\common\i18n.c"
 				>
 			</File>
@@ -417,10 +459,6 @@
 				RelativePath="..\common\win16api.c"
 				>
 			</File>
-			<File
-				RelativePath="fileread.cpp"
-				>
-			</File>
 		</Filter>
 	</Files>
 	<Globals>

Modified: branches/ssh_auth_dialog/teraterm/ttpmacro/ttpmacro.vcproj
===================================================================
--- branches/ssh_auth_dialog/teraterm/ttpmacro/ttpmacro.vcproj	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/teraterm/ttpmacro/ttpmacro.vcproj	2019-04-24 14:08:16 UTC (rev 7613)
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="shift_jis"?>
-
 <VisualStudioProject
 	ProjectType="Visual C++"
 	Version="8.00"
@@ -21,8 +20,9 @@
 			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
 			IntermediateDirectory="$(ConfigurationName)"
 			ConfigurationType="1"
-			UseOfMFC="1"
+			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -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 user32.lib gdi32.lib SHELL32.lib comctl32.lib comdlg32.lib ws2_32.lib ole32.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"
@@ -113,8 +112,9 @@
 			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
 			IntermediateDirectory="$(ConfigurationName)"
 			ConfigurationType="1"
-			UseOfMFC="1"
+			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -163,11 +163,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 user32.lib gdi32.lib SHELL32.lib comctl32.lib comdlg32.lib ws2_32.lib ole32.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"
@@ -211,6 +210,26 @@
 				>
 			</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>
@@ -231,10 +250,14 @@
 				>
 			</File>
 			<File
-				RelativePath="..\common\stdafx.cpp"
+				RelativePath="..\common\tmfc.cpp"
 				>
 			</File>
 			<File
+				RelativePath="..\common\tmfc_frame.cpp"
+				>
+			</File>
+			<File
 				RelativePath="ttmacro.cpp"
 				>
 			</File>
@@ -256,6 +279,14 @@
 				>
 			</File>
 			<File
+				RelativePath="..\common\compat_win.h"
+				>
+			</File>
+			<File
+				RelativePath="..\common\dllutil.h"
+				>
+			</File>
+			<File
 				RelativePath="errdlg.h"
 				>
 			</File>
@@ -284,6 +315,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\common\tmfc.h"
+				>
+			</File>
+			<File
 				RelativePath="..\common\ttddecmnd.h"
 				>
 			</File>
@@ -384,6 +419,10 @@
 			Filter="c"
 			>
 			<File
+				RelativePath="fileread.cpp"
+				>
+			</File>
+			<File
 				RelativePath="..\common\i18n.c"
 				>
 			</File>
@@ -423,10 +462,6 @@
 				RelativePath="..\common\win16api.c"
 				>
 			</File>
-			<File
-				RelativePath="fileread.cpp"
-				>
-			</File>
 		</Filter>
 	</Files>
 	<Globals>

Deleted: branches/ssh_auth_dialog/teraterm/ttpset/set_res.h
===================================================================
--- branches/ssh_auth_dialog/teraterm/ttpset/set_res.h	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/teraterm/ttpset/set_res.h	2019-04-24 14:08:16 UTC (rev 7613)
@@ -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/ssh_auth_dialog/teraterm/ttpset/ttpset-version.rc
===================================================================
--- branches/ssh_auth_dialog/teraterm/ttpset/ttpset-version.rc	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/teraterm/ttpset/ttpset-version.rc	2019-04-24 14:08:16 UTC (rev 7613)
@@ -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

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

Deleted: branches/ssh_auth_dialog/teraterm/ttpset/ttpset.rc
===================================================================
--- branches/ssh_auth_dialog/teraterm/ttpset/ttpset.rc	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/teraterm/ttpset/ttpset.rc	2019-04-24 14:08:16 UTC (rev 7613)
@@ -1,64 +0,0 @@
-// Microsoft Visual C++ generated resource script.
-//
-#include "set_res.h"
-
-#define APSTUDIO_READONLY_SYMBOLS
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 2 resource.
-//
-#include "afxres.h"
-
-/////////////////////////////////////////////////////////////////////////////
-#undef APSTUDIO_READONLY_SYMBOLS
-
-/////////////////////////////////////////////////////////////////////////////
-// \x93\xFA\x96{\x8C\xEA resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_JPN)
-#ifdef _WIN32
-LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT
-#pragma code_page(932)
-#endif //_WIN32
-
-#ifdef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// TEXTINCLUDE
-//
-
-1 TEXTINCLUDE 
-BEGIN
-    "resource.h\0"
-END
-
-2 TEXTINCLUDE 
-BEGIN
-    "#include ""afxres.h""\r\n"
-    "\0"
-END
-
-3 TEXTINCLUDE 
-BEGIN
-    "#include ""ttpset-version.rc""\r\n"
-    "\0"
-END
-
-#endif    // APSTUDIO_INVOKED
-
-
-#endif    // \x93\xFA\x96{\x8C\xEA resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-
-#ifndef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 3 resource.
-//
-#include "ttpset-version.rc"
-
-/////////////////////////////////////////////////////////////////////////////
-#endif    // not APSTUDIO_INVOKED
-

Modified: branches/ssh_auth_dialog/teraterm/ttpset/ttpset.v10.vcxproj
===================================================================
--- branches/ssh_auth_dialog/teraterm/ttpset/ttpset.v10.vcxproj	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/teraterm/ttpset/ttpset.v10.vcxproj	2019-04-24 14:08:16 UTC (rev 7613)
@@ -126,7 +126,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 +136,6 @@
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="ttpset-version.rc" />
-    <ResourceCompile Include="ttpset.rc" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\ttpcmn\ttpcmn.v10.vcxproj">

Modified: branches/ssh_auth_dialog/teraterm/ttpset/ttpset.v10.vcxproj.filters
===================================================================
--- branches/ssh_auth_dialog/teraterm/ttpset/ttpset.v10.vcxproj.filters	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/teraterm/ttpset/ttpset.v10.vcxproj.filters	2019-04-24 14:08:16 UTC (rev 7613)
@@ -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>
@@ -52,8 +49,5 @@
     <ResourceCompile Include="ttpset-version.rc">
       <Filter>Resource File</Filter>
     </ResourceCompile>
-    <ResourceCompile Include="ttpset.rc">
-      <Filter>Resource File</Filter>
-    </ResourceCompile>
   </ItemGroup>
 </Project>

Modified: branches/ssh_auth_dialog/teraterm/ttpset/ttpset.v11.vcxproj
===================================================================
--- branches/ssh_auth_dialog/teraterm/ttpset/ttpset.v11.vcxproj	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/teraterm/ttpset/ttpset.v11.vcxproj	2019-04-24 14:08:16 UTC (rev 7613)
@@ -130,7 +130,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 +140,6 @@
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="ttpset-version.rc" />
-    <ResourceCompile Include="ttpset.rc" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\ttpcmn\ttpcmn.v11.vcxproj">

Modified: branches/ssh_auth_dialog/teraterm/ttpset/ttpset.v11.vcxproj.filters
===================================================================
--- branches/ssh_auth_dialog/teraterm/ttpset/ttpset.v11.vcxproj.filters	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/teraterm/ttpset/ttpset.v11.vcxproj.filters	2019-04-24 14:08:16 UTC (rev 7613)
@@ -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>
@@ -52,8 +49,5 @@
     <ResourceCompile Include="ttpset-version.rc">
       <Filter>Resource File</Filter>
     </ResourceCompile>
-    <ResourceCompile Include="ttpset.rc">
-      <Filter>Resource File</Filter>
-    </ResourceCompile>
   </ItemGroup>
 </Project>

Modified: branches/ssh_auth_dialog/teraterm/ttpset/ttpset.v12.vcxproj
===================================================================
--- branches/ssh_auth_dialog/teraterm/ttpset/ttpset.v12.vcxproj	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/teraterm/ttpset/ttpset.v12.vcxproj	2019-04-24 14:08:16 UTC (rev 7613)
@@ -130,7 +130,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 +140,6 @@
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="ttpset-version.rc" />
-    <ResourceCompile Include="ttpset.rc" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\ttpcmn\ttpcmn.v12.vcxproj">

Modified: branches/ssh_auth_dialog/teraterm/ttpset/ttpset.v12.vcxproj.filters
===================================================================
--- branches/ssh_auth_dialog/teraterm/ttpset/ttpset.v12.vcxproj.filters	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/teraterm/ttpset/ttpset.v12.vcxproj.filters	2019-04-24 14:08:16 UTC (rev 7613)
@@ -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>
@@ -52,8 +49,5 @@
     <ResourceCompile Include="ttpset-version.rc">
       <Filter>Resource File</Filter>
     </ResourceCompile>
-    <ResourceCompile Include="ttpset.rc">
-      <Filter>Resource File</Filter>
-    </ResourceCompile>
   </ItemGroup>
 </Project>

Modified: branches/ssh_auth_dialog/teraterm/ttpset/ttpset.v14.vcxproj
===================================================================
--- branches/ssh_auth_dialog/teraterm/ttpset/ttpset.v14.vcxproj	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/teraterm/ttpset/ttpset.v14.vcxproj	2019-04-24 14:08:16 UTC (rev 7613)
@@ -130,7 +130,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 +140,6 @@
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="ttpset-version.rc" />
-    <ResourceCompile Include="ttpset.rc" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\ttpcmn\ttpcmn.v14.vcxproj">

Modified: branches/ssh_auth_dialog/teraterm/ttpset/ttpset.v14.vcxproj.filters
===================================================================
--- branches/ssh_auth_dialog/teraterm/ttpset/ttpset.v14.vcxproj.filters	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/teraterm/ttpset/ttpset.v14.vcxproj.filters	2019-04-24 14:08:16 UTC (rev 7613)
@@ -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>
@@ -52,8 +49,5 @@
     <ResourceCompile Include="ttpset-version.rc">
       <Filter>Resource File</Filter>
     </ResourceCompile>
-    <ResourceCompile Include="ttpset.rc">
-      <Filter>Resource File</Filter>
-    </ResourceCompile>
   </ItemGroup>
 </Project>

Modified: branches/ssh_auth_dialog/teraterm/ttpset/ttpset.v15.vcxproj
===================================================================
--- branches/ssh_auth_dialog/teraterm/ttpset/ttpset.v15.vcxproj	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/teraterm/ttpset/ttpset.v15.vcxproj	2019-04-24 14:08:16 UTC (rev 7613)
@@ -133,7 +133,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 +143,6 @@
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="ttpset-version.rc" />
-    <ResourceCompile Include="ttpset.rc" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\ttpcmn\ttpcmn.v15.vcxproj">

Modified: branches/ssh_auth_dialog/teraterm/ttpset/ttpset.v15.vcxproj.filters
===================================================================
--- branches/ssh_auth_dialog/teraterm/ttpset/ttpset.v15.vcxproj.filters	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/teraterm/ttpset/ttpset.v15.vcxproj.filters	2019-04-24 14:08:16 UTC (rev 7613)
@@ -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>
@@ -52,8 +49,5 @@
     <ResourceCompile Include="ttpset-version.rc">
       <Filter>Resource File</Filter>
     </ResourceCompile>
-    <ResourceCompile Include="ttpset.rc">
-      <Filter>Resource File</Filter>
-    </ResourceCompile>
   </ItemGroup>
 </Project>

Copied: branches/ssh_auth_dialog/teraterm/ttpset/ttpset.v16.vcxproj (from rev 7520, branches/ssh_auth_dialog/teraterm/ttpset/ttpset.v15.vcxproj)
===================================================================
--- branches/ssh_auth_dialog/teraterm/ttpset/ttpset.v16.vcxproj	                        (rev 0)
+++ branches/ssh_auth_dialog/teraterm/ttpset/ttpset.v16.vcxproj	2019-04-24 14:08:16 UTC (rev 7613)
@@ -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>{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>
+      <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>
+      <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.v15.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/ssh_auth_dialog/teraterm/ttpset/ttpset.v16.vcxproj.filters (from rev 7520, branches/ssh_auth_dialog/teraterm/ttpset/ttpset.v14.vcxproj.filters)
===================================================================
--- branches/ssh_auth_dialog/teraterm/ttpset/ttpset.v16.vcxproj.filters	                        (rev 0)
+++ branches/ssh_auth_dialog/teraterm/ttpset/ttpset.v16.vcxproj.filters	2019-04-24 14:08:16 UTC (rev 7613)
@@ -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>Source Files</Filter>
+    </ResourceCompile>
+  </ItemGroup>
+</Project>

Modified: branches/ssh_auth_dialog/teraterm/ttpset/ttpset.v9.vcproj
===================================================================
--- branches/ssh_auth_dialog/teraterm/ttpset/ttpset.v9.vcproj	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/teraterm/ttpset/ttpset.v9.vcproj	2019-04-24 14:08:16 UTC (rev 7613)
@@ -218,10 +218,6 @@
 			Filter="h;hpp;hxx;hm;inl;fi;fd"
 			>
 			<File
-				RelativePath="set_res.h"
-				>
-			</File>
-			<File
 				RelativePath="..\common\teraterm.h"
 				>
 			</File>
@@ -255,10 +251,6 @@
 				RelativePath="ttpset-version.rc"
 				>
 			</File>
-			<File
-				RelativePath="ttpset.rc"
-				>
-			</File>
 		</Filter>
 	</Files>
 	<Globals>

Modified: branches/ssh_auth_dialog/teraterm/ttpset/ttpset.vcproj
===================================================================
--- branches/ssh_auth_dialog/teraterm/ttpset/ttpset.vcproj	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/teraterm/ttpset/ttpset.vcproj	2019-04-24 14:08:16 UTC (rev 7613)
@@ -70,7 +70,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="ttpcmn.lib"
+				AdditionalDependencies="User32.lib gdi32.lib SHELL32.lib ole32.lib ttpcmn.lib"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="$(OutDir)"
@@ -162,7 +162,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="ttpcmn.lib"
+				AdditionalDependencies="User32.lib gdi32.lib SHELL32.lib ole32.lib ttpcmn.lib"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="$(OutDir)"
@@ -219,10 +219,6 @@
 			Filter="h;hpp;hxx;hm;inl;fi;fd"
 			>
 			<File
-				RelativePath="set_res.h"
-				>
-			</File>
-			<File
 				RelativePath="..\common\teraterm.h"
 				>
 			</File>
@@ -256,10 +252,6 @@
 				RelativePath="ttpset-version.rc"
 				>
 			</File>
-			<File
-				RelativePath="ttpset.rc"
-				>
-			</File>
 		</Filter>
 	</Files>
 	<Globals>

Modified: branches/ssh_auth_dialog/teraterm/ttptek/CMakeLists.txt
===================================================================
--- branches/ssh_auth_dialog/teraterm/ttptek/CMakeLists.txt	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/teraterm/ttptek/CMakeLists.txt	2019-04-24 14:08:16 UTC (rev 7613)
@@ -22,11 +22,9 @@
   )
 
 set(SRC
-  tek_res.h
   tekesc.c
   tekesc.h
   ttptek.def
-  ttptek.rc
   ttptek-version.rc
   tttek.h
   tttek.c

Deleted: branches/ssh_auth_dialog/teraterm/ttptek/tek_res.h
===================================================================
--- branches/ssh_auth_dialog/teraterm/ttptek/tek_res.h	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/teraterm/ttptek/tek_res.h	2019-04-24 14:08:16 UTC (rev 7613)
@@ -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/ssh_auth_dialog/teraterm/ttptek/ttptek-version.rc
===================================================================
--- branches/ssh_auth_dialog/teraterm/ttptek/ttptek-version.rc	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/teraterm/ttptek/ttptek-version.rc	2019-04-24 14:08:16 UTC (rev 7613)
@@ -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

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

Deleted: branches/ssh_auth_dialog/teraterm/ttptek/ttptek.rc
===================================================================
--- branches/ssh_auth_dialog/teraterm/ttptek/ttptek.rc	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/teraterm/ttptek/ttptek.rc	2019-04-24 14:08:16 UTC (rev 7613)
@@ -1,65 +0,0 @@
-// Microsoft Visual C++ generated resource script.
-//
-#include "tek_res.h"
-
-#define APSTUDIO_READONLY_SYMBOLS
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 2 resource.
-//
-#include "afxres.h"
-
-/////////////////////////////////////////////////////////////////////////////
-#undef APSTUDIO_READONLY_SYMBOLS
-
-/////////////////////////////////////////////////////////////////////////////
-// \x93\xFA\x96{\x8C\xEA resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_JPN)
-#ifdef _WIN32
-LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT
-#pragma code_page(932)
-#endif //_WIN32
-
-#ifdef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// TEXTINCLUDE
-//
-
-1 TEXTINCLUDE 
-BEGIN
-    "tek_res.h\0"
-END
-
-2 TEXTINCLUDE 
-BEGIN
-    "#include ""afxres.h""\r\n"
-    "\0"
-END
-
-3 TEXTINCLUDE 
-BEGIN
-    "#include ""ttptek-version.rc""\r\n"
-    "\0"
-END
-
-#endif    // APSTUDIO_INVOKED
-
-
-
-#endif    // \x93\xFA\x96{\x8C\xEA resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-
-#ifndef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 3 resource.
-//
-#include "ttptek-version.rc"
-
-/////////////////////////////////////////////////////////////////////////////
-#endif    // not APSTUDIO_INVOKED
-

Modified: branches/ssh_auth_dialog/teraterm/ttptek/ttptek.v10.vcxproj
===================================================================
--- branches/ssh_auth_dialog/teraterm/ttptek/ttptek.v10.vcxproj	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/teraterm/ttptek/ttptek.v10.vcxproj	2019-04-24 14:08:16 UTC (rev 7613)
@@ -125,7 +125,6 @@
     <ClCompile Include="tttek.c" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="tek_res.h" />
     <ClInclude Include="tekesc.h" />
   </ItemGroup>
   <ItemGroup>
@@ -133,7 +132,6 @@
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="ttptek-version.rc" />
-    <ResourceCompile Include="ttptek.rc" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\ttpcmn\ttpcmn.v10.vcxproj">

Modified: branches/ssh_auth_dialog/teraterm/ttptek/ttptek.v10.vcxproj.filters
===================================================================
--- branches/ssh_auth_dialog/teraterm/ttptek/ttptek.v10.vcxproj.filters	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/teraterm/ttptek/ttptek.v10.vcxproj.filters	2019-04-24 14:08:16 UTC (rev 7613)
@@ -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>
@@ -46,8 +43,5 @@
     <ResouceCompile Include="ttptek-version.rc">
       <Filter>Resource File</Filter>
     </ResouceCompile>
-    <ResouceCompile Include="ttptek.rc">
-      <Filter>Resource File</Filter>
-    </ResouceCompile>
   </ItemGroup>
 </Project>

Modified: branches/ssh_auth_dialog/teraterm/ttptek/ttptek.v11.vcxproj
===================================================================
--- branches/ssh_auth_dialog/teraterm/ttptek/ttptek.v11.vcxproj	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/teraterm/ttptek/ttptek.v11.vcxproj	2019-04-24 14:08:16 UTC (rev 7613)
@@ -129,7 +129,6 @@
     <ClCompile Include="tttek.c" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="tek_res.h" />
     <ClInclude Include="tekesc.h" />
   </ItemGroup>
   <ItemGroup>
@@ -137,7 +136,6 @@
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="ttptek-version.rc" />
-    <ResourceCompile Include="ttptek.rc" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\ttpcmn\ttpcmn.v11.vcxproj">

Modified: branches/ssh_auth_dialog/teraterm/ttptek/ttptek.v11.vcxproj.filters
===================================================================
--- branches/ssh_auth_dialog/teraterm/ttptek/ttptek.v11.vcxproj.filters	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/teraterm/ttptek/ttptek.v11.vcxproj.filters	2019-04-24 14:08:16 UTC (rev 7613)
@@ -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>
@@ -46,8 +43,5 @@
     <ResouceCompile Include="ttptek-version.rc">
       <Filter>Resource File</Filter>
     </ResouceCompile>
-    <ResouceCompile Include="ttptek.rc">
-      <Filter>Resource File</Filter>
-    </ResouceCompile>
   </ItemGroup>
 </Project>

Modified: branches/ssh_auth_dialog/teraterm/ttptek/ttptek.v12.vcxproj
===================================================================
--- branches/ssh_auth_dialog/teraterm/ttptek/ttptek.v12.vcxproj	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/teraterm/ttptek/ttptek.v12.vcxproj	2019-04-24 14:08:16 UTC (rev 7613)
@@ -129,7 +129,6 @@
     <ClCompile Include="tttek.c" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="tek_res.h" />
     <ClInclude Include="tekesc.h" />
   </ItemGroup>
   <ItemGroup>
@@ -137,7 +136,6 @@
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="ttptek-version.rc" />
-    <ResourceCompile Include="ttptek.rc" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\ttpcmn\ttpcmn.v12.vcxproj">

Modified: branches/ssh_auth_dialog/teraterm/ttptek/ttptek.v12.vcxproj.filters
===================================================================
--- branches/ssh_auth_dialog/teraterm/ttptek/ttptek.v12.vcxproj.filters	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/teraterm/ttptek/ttptek.v12.vcxproj.filters	2019-04-24 14:08:16 UTC (rev 7613)
@@ -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>
@@ -46,8 +43,5 @@
     <ResouceCompile Include="ttptek-version.rc">
       <Filter>Resource File</Filter>
     </ResouceCompile>
-    <ResouceCompile Include="ttptek.rc">
-      <Filter>Resource File</Filter>
-    </ResouceCompile>
   </ItemGroup>
 </Project>

Modified: branches/ssh_auth_dialog/teraterm/ttptek/ttptek.v14.vcxproj
===================================================================
--- branches/ssh_auth_dialog/teraterm/ttptek/ttptek.v14.vcxproj	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/teraterm/ttptek/ttptek.v14.vcxproj	2019-04-24 14:08:16 UTC (rev 7613)
@@ -129,7 +129,6 @@
     <ClCompile Include="tttek.c" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="tek_res.h" />
     <ClInclude Include="tekesc.h" />
   </ItemGroup>
   <ItemGroup>
@@ -137,7 +136,6 @@
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="ttptek-version.rc" />
-    <ResourceCompile Include="ttptek.rc" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\ttpcmn\ttpcmn.v14.vcxproj">

Modified: branches/ssh_auth_dialog/teraterm/ttptek/ttptek.v14.vcxproj.filters
===================================================================
--- branches/ssh_auth_dialog/teraterm/ttptek/ttptek.v14.vcxproj.filters	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/teraterm/ttptek/ttptek.v14.vcxproj.filters	2019-04-24 14:08:16 UTC (rev 7613)
@@ -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>
@@ -46,8 +43,5 @@
     <ResouceCompile Include="ttptek-version.rc">
       <Filter>Resource File</Filter>
     </ResouceCompile>
-    <ResouceCompile Include="ttptek.rc">
-      <Filter>Resource File</Filter>
-    </ResouceCompile>
   </ItemGroup>
 </Project>

Modified: branches/ssh_auth_dialog/teraterm/ttptek/ttptek.v15.vcxproj
===================================================================
--- branches/ssh_auth_dialog/teraterm/ttptek/ttptek.v15.vcxproj	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/teraterm/ttptek/ttptek.v15.vcxproj	2019-04-24 14:08:16 UTC (rev 7613)
@@ -132,7 +132,6 @@
     <ClCompile Include="tttek.c" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="tek_res.h" />
     <ClInclude Include="tekesc.h" />
   </ItemGroup>
   <ItemGroup>
@@ -140,7 +139,6 @@
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="ttptek-version.rc" />
-    <ResourceCompile Include="ttptek.rc" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\ttpcmn\ttpcmn.v15.vcxproj">

Modified: branches/ssh_auth_dialog/teraterm/ttptek/ttptek.v15.vcxproj.filters
===================================================================
--- branches/ssh_auth_dialog/teraterm/ttptek/ttptek.v15.vcxproj.filters	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/teraterm/ttptek/ttptek.v15.vcxproj.filters	2019-04-24 14:08:16 UTC (rev 7613)
@@ -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>
@@ -46,8 +43,5 @@
     <ResouceCompile Include="ttptek-version.rc">
       <Filter>Resource File</Filter>
     </ResouceCompile>
-    <ResouceCompile Include="ttptek.rc">
-      <Filter>Resource File</Filter>
-    </ResouceCompile>
   </ItemGroup>
 </Project>

Copied: branches/ssh_auth_dialog/teraterm/ttptek/ttptek.v16.vcxproj (from rev 7520, branches/ssh_auth_dialog/teraterm/ttptek/ttptek.v15.vcxproj)
===================================================================
--- branches/ssh_auth_dialog/teraterm/ttptek/ttptek.v16.vcxproj	                        (rev 0)
+++ branches/ssh_auth_dialog/teraterm/ttptek/ttptek.v16.vcxproj	2019-04-24 14:08:16 UTC (rev 7613)
@@ -0,0 +1,152 @@
+<?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>
+      <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>
+      <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.v15.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/ssh_auth_dialog/teraterm/ttptek/ttptek.v16.vcxproj.filters (from rev 7520, branches/ssh_auth_dialog/teraterm/ttptek/ttptek.v15.vcxproj.filters)
===================================================================
--- branches/ssh_auth_dialog/teraterm/ttptek/ttptek.v16.vcxproj.filters	                        (rev 0)
+++ branches/ssh_auth_dialog/teraterm/ttptek/ttptek.v16.vcxproj.filters	2019-04-24 14:08:16 UTC (rev 7613)
@@ -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>Source Files</Filter>
+    </ResourceCompile>
+  </ItemGroup>
+</Project>

Modified: branches/ssh_auth_dialog/teraterm/ttptek/ttptek.v9.vcproj
===================================================================
--- branches/ssh_auth_dialog/teraterm/ttptek/ttptek.v9.vcproj	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/teraterm/ttptek/ttptek.v9.vcproj	2019-04-24 14:08:16 UTC (rev 7613)
@@ -221,10 +221,6 @@
 			Filter="h;hpp;hxx;hm;inl;fi;fd"
 			>
 			<File
-				RelativePath="tek_res.h"
-				>
-			</File>
-			<File
 				RelativePath="tekesc.h"
 				>
 			</File>
@@ -246,10 +242,6 @@
 				RelativePath="ttptek-version.rc"
 				>
 			</File>
-			<File
-				RelativePath="ttptek.rc"
-				>
-			</File>
 		</Filter>
 	</Files>
 	<Globals>

Modified: branches/ssh_auth_dialog/teraterm/ttptek/ttptek.vcproj
===================================================================
--- branches/ssh_auth_dialog/teraterm/ttptek/ttptek.vcproj	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/teraterm/ttptek/ttptek.vcproj	2019-04-24 14:08:16 UTC (rev 7613)
@@ -69,7 +69,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="ttpcmn.lib"
+				AdditionalDependencies="User32.lib gdi32.lib SHELL32.lib ole32.lib ttpcmn.lib"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="$(OutDir)"
@@ -161,7 +161,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="ttpcmn.lib"
+				AdditionalDependencies="User32.lib gdi32.lib SHELL32.lib ole32.lib ttpcmn.lib"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="$(OutDir)"
@@ -222,10 +222,6 @@
 			Filter="h;hpp;hxx;hm;inl;fi;fd"
 			>
 			<File
-				RelativePath="tek_res.h"
-				>
-			</File>
-			<File
 				RelativePath="tekesc.h"
 				>
 			</File>
@@ -247,10 +243,6 @@
 				RelativePath="ttptek-version.rc"
 				>
 			</File>
-			<File
-				RelativePath="ttptek.rc"
-				>
-			</File>
 		</Filter>
 	</Files>
 	<Globals>

Added: branches/ssh_auth_dialog/tests/gui_commands_test.ttl
===================================================================
--- branches/ssh_auth_dialog/tests/gui_commands_test.ttl	                        (rev 0)
+++ branches/ssh_auth_dialog/tests/gui_commands_test.ttl	2019-04-24 14:08:16 UTC (rev 7613)
@@ -0,0 +1,259 @@
+;;;
+;;; test gui commands
+;;;
+;
+call test_messagebox
+call test_errordialogbox
+call test_yesnobox
+call test_inputbox
+call test_passwordbox
+call test_statusbox
+call test_macrodialogbox
+call test_listbox
+messagebox "finish all tests" "test"
+end
+
+;;;;;;;;;;;;;;;;
+;;; messagebox
+:test_messagebox
+s = "messagebox test\nthis is basic test\n3 lines"
+strspecial s
+messagebox s "test messagebox"
+messagebox "finish messagebox test" "test messagebox"
+return
+
+;;;;;;;;;;;;;;;;
+;;; error dialog
+;;; - Dependence
+;;;		messagebox
+:test_errordialogbox
+messagebox "Please push `continue` button in next window" "test errordialogbox"
+this_line_is_error_push_continue
+messagebox "finish error dialog test" "test error dialog"
+return
+
+;;;;;;;;;;;;;;;;
+;;; yesnobox
+;;; - Dependence
+;;;		messagebox
+:test_yesnobox
+yes = 0
+no = 0
+while ((yes == 0) or (no == 0))
+	yesnobox "push yes or no" "test yesnobox"
+	if result == 1 yes = yes + 1
+	if result == 0 no = no + 1
+	sprintf "yes=%d no=%d" yes no
+	messagebox inputstr "test yesnobox"
+endwhile
+sprintf "finish yesnobox test\nyes=%d no=%d" yes no
+s = inputstr
+strspecial s
+messagebox s "test yesnobox"
+return
+
+;;;;;;;;;;;;;;;;
+;;; inputbox
+;;; - Dependence
+;;;		messagebox
+:test_inputbox
+s = "default string"
+match = 0
+while match == 0
+	inputbox "input `ok` to finish" "test inputbox" s
+	s = inputstr
+	sprintf "input string is `%s`" s
+	messagebox inputstr "test inputbox"
+	strmatch s "^ok$"
+	match = result
+endwhile
+messagebox "finish inputbox test" "test inputbox"
+return
+
+;;;;;;;;;;;;;;;;
+;;; passwordbox
+;;; - Dependence
+;;;		messagebox
+:test_passwordbox
+match = 0
+while match == 0
+	passwordbox "input `password` to finish" "test passwordbox"
+	s = inputstr
+	sprintf "input string is `%s`" s
+	messagebox inputstr "test inputbox"
+	strmatch s "^password$"
+	match = result
+endwhile
+messagebox "finish passwordbox test" "test passwordbox"
+return
+
+;;;;;;;;;;;;;;;;
+;;; statusbox
+;;; setdlgpos
+;;; closesbox
+;;; - Dependence
+;;;		messagebox
+:test_statusbox
+call test_statusbox_centerwindow
+call test_statusbox_setdlgpos
+return
+
+; 表示されていない→表示する 時 センタリングされる
+; 表示されている時 width=変化しない height=変化する(フィット) pos=変化しない
+:test_statusbox_centerwindow
+pause_time = 3
+statusbox "statusbox message" "test statusbox"
+pause pause_time
+sprintf2 s "1 line1\n2 line2 \n3 line3\n4 long long long long long line"
+strspecial s
+statusbox s "test statusbox"
+pause pause_time
+closesbox
+statusbox s "test statusbox"
+pause pause_time
+statusbox "statusbox message" "test statusbox"
+pause pause_time
+closesbox
+statusbox "statusbox message" "test statusbox"
+pause pause_time
+closesbox
+messagebox "finish statusbox centerwindow test" "test statusbox"
+return
+
+:test_statusbox_setdlgpos
+pause_time = 1
+last_val = 3
+statusbox "statusbox message" "test statusbox"
+pause pause_time
+for i 1 last_val
+	x = i*10
+	y = i*10
+	setdlgpos x y
+	sprintf2 s "setdlgpos\ni=%d/%d\n(%d,%d)" i last_val x y
+	strspecial s
+	statusbox s "test statusbox/setdlgpos"
+	pause pause_time
+next
+closesbox
+s = "Please overwrap other window\nwait 5 sec\nbringupbox test"
+strspecial s
+setdlgpos 0 0
+statusbox s "test statusbox"
+pause 5
+bringupbox
+statusbox "bringupbox" "test statusbox"
+pause 5
+closesbox
+setdlgpos -10000 0	  ; go center
+messagebox "finish statusbox setdlgpos test" "test statusbox"
+return
+
+;;;;;;;;;;;;;;;;
+;;; macrodialog box
+;;; show
+;;; - Dependence
+;;;		messagebox
+:test_macrodialogbox
+call test_macrodialogbox_show
+call test_macrodialogbox_move_resize
+messagebox "finish macro dialogbox test" "test macro dialogbox"
+return
+
+:test_macrodialogbox_show
+N = 5
+intdim show_flag_list N
+show_flag_list[0] = 1
+show_flag_list[1] = -1
+show_flag_list[2] = 1
+show_flag_list[3] = 0
+show_flag_list[4] = 1
+for i 0 N-1
+	show_flag = show_flag_list[i]
+	show show_flag
+	if show_flag < 0 then
+	   s = "macro dialog box was hidden\ncheck task bar"
+	elseif show_flag == 0 then
+	   s = "macro dialog box was minimize\ncheck task bar"
+	elseif show_flag > 0 then
+	   s = "macro dialog box was shown\nmove this messagebox and check macro dialog box"
+	endif
+	sprintf "show %d\n%s" show_flag s
+	s = inputstr
+	strspecial s
+	messagebox s "test macrodialog/show"
+next
+return
+
+:test_macrodialogbox_move_resize
+w = 15
+sprintf "move and resize test\nwait %d sec" w
+s = inputstr
+strspecial s
+messagebox s "test macro dialog"
+pause w
+messagebox "finish move and resize test" "test macro dialog/move and resize"
+return
+
+;;;;;;;;;;;;;;;;
+;;; listbox
+;;; - Dependence
+;;;		messagebox
+:test_listbox
+N = 7
+intdim done N
+strdim strs N
+strdim srcs N
+for i 0 N-1
+	done[i] = 0
+next
+srcs[0] = "No man should understand where his dreams come from, Data. (Soong to Data, Birthright pt. 1)"
+srcs[1] = "The Advocate will refrain from making her opponent disappear. (Data to Ardra, Devil's Due)"
+srcs[2] = "He's comparing the Enterprise to a cruise ship? (Picard, The Neutral Zone)"
+srcs[3] = "What's the first rule of acquisition?"
+srcs[4] = "Once you have their money, you never give it back."
+srcs[5] = "Don't thank me, I already regret it. (Odo)"
+srcs[6] = "How long can two people talk about nothing? (Deanna, Starship Mine) "
+done_all = 0
+done_cancel = 0
+prev = 0
+while ((done_all == 0) or (done_cancel == 0))
+	for i 0 N-1
+		if done[i] == 0 then
+			s = ""
+		else
+			s = "[selected]"
+		endif
+		sprintf2 s "%s %s" s srcs[i]
+		strs[i] = s
+	next
+	if done_all == 0 then
+		msg = "select one from list and `ok`"
+		if done_cancel == 0 then
+			strconcat msg " or `cancel`"
+		endif
+	else
+		msg = "push `cancel`"
+	endif
+	listbox msg "test listbox" strs prev
+	if result < 0 then
+		done_cancel = 1
+		continue
+	endif
+	prev = result
+	if done[result] == 0 then
+		done[result] = 1
+	else
+		done[result] = 0
+	endif
+	done_all = 1
+	for i 0 N-1
+		if done[i] == 0 then
+			done_all = 0
+			break
+		endif
+	next
+endwhile
+messagebox "finish listbox test" "test listbox"
+return
+
+

Added: branches/ssh_auth_dialog/tests/gui_commands_test_utf8.ttl
===================================================================
--- branches/ssh_auth_dialog/tests/gui_commands_test_utf8.ttl	                        (rev 0)
+++ branches/ssh_auth_dialog/tests/gui_commands_test_utf8.ttl	2019-04-24 14:08:16 UTC (rev 7613)
@@ -0,0 +1,286 @@
+;;;
+;;; test gui commands
+;;;
+;
+call test_messagebox
+call test_errordialogbox
+call test_yesnobox
+call test_inputbox
+call test_passwordbox
+call test_statusbox
+call test_macrodialogbox
+call test_listbox
+call test_filenamebox
+call test_dirnamebox
+messagebox "finish all tests" "test"
+end
+
+;;;;;;;;;;;;;;;;
+;;; messagebox
+:test_messagebox
+s = "メッセージボックス\nthis is basic test\n3 행"
+strspecial s
+messagebox s "メッセージボックス"
+messagebox "finish messagebox test" "test messagebox"
+return
+
+;;;;;;;;;;;;;;;;
+;;; error dialog
+;;; - Dependence
+;;;		messagebox
+:test_errordialogbox
+messagebox "Please push `continue` button in next window" "test errordialogbox"
+this_line_is_error_push_continue
+messagebox "finish error dialog test" "test error dialog"
+return
+
+;;;;;;;;;;;;;;;;
+;;; yesnobox
+;;; - Dependence
+;;;		messagebox
+:test_yesnobox
+yes = 0
+no = 0
+while ((yes == 0) or (no == 0))
+	yesnobox "push 是的(yes) or 没有(no)" "test yesnobox"
+	if result == 1 yes = yes + 1
+	if result == 0 no = no + 1
+	sprintf "yes=%d no=%d" yes no
+	messagebox inputstr "test yesnobox"
+endwhile
+sprintf "finish yesnobox test\nyes=%d no=%d" yes no
+s = inputstr
+strspecial s
+messagebox s "test yesnobox"
+return
+
+;;;;;;;;;;;;;;;;
+;;; inputbox
+;;; - Dependence
+;;;		messagebox
+:test_inputbox
+s = "default string"
+match = 0
+while match == 0
+	inputbox "入力 `ok` to finish" "test inputbox" s
+	s = inputstr
+	sprintf "入力文字列 は `%s`" s
+	messagebox inputstr "test inputbox"
+	strmatch s "^ok$"
+	match = result
+endwhile
+messagebox "finish inputbox test" "test inputbox"
+return
+
+;;;;;;;;;;;;;;;;
+;;; passwordbox
+;;; - Dependence
+;;;		messagebox
+:test_passwordbox
+match = 0
+while match == 0
+	passwordbox "`password` と入力すると終了" "test passwordbox"
+	s = inputstr
+	sprintf "入力文字列 は `%s`" s
+	messagebox inputstr "test inputbox"
+	strmatch s "^password$"
+	match = result
+endwhile
+messagebox "finish passwordbox test" "test passwordbox"
+return
+
+;;;;;;;;;;;;;;;;
+;;; statusbox
+;;; setdlgpos
+;;; closesbox
+;;; - Dependence
+;;;		messagebox
+:test_statusbox
+call test_statusbox_centerwindow
+;call test_statusbox_setdlgpos
+return
+
+; 表示されていない→表示する 時 センタリングされる
+; 表示されている時 width=変化しない height=変化する(フィット) pos=変化しない
+:test_statusbox_centerwindow
+pause_time = 3
+statusbox "statusbox message" "test statusbox"
+pause pause_time
+sprintf2 s "1 line1\n2 line2 \n3 line3\n4 long long long long long line"
+strspecial s
+statusbox s "test statusbox"
+pause pause_time
+closesbox
+statusbox s "test statusbox"
+pause pause_time
+statusbox "statusbox message" "test statusbox"
+pause pause_time
+closesbox
+statusbox "statusbox message" "test statusbox"
+pause pause_time
+closesbox
+messagebox "finish statusbox centerwindow test" "test statusbox"
+return
+
+:test_statusbox_setdlgpos
+pause_time = 1
+last_val = 3
+statusbox "statusbox message" "test statusbox"
+pause pause_time
+for i 1 last_val
+	x = i*10
+	y = i*10
+	setdlgpos x y
+	sprintf2 s "setdlgpos\ni=%d/%d\n(%d,%d)" i last_val x y
+	strspecial s
+	statusbox s "test statusbox/setdlgpos"
+	pause pause_time
+next
+closesbox
+s = "Please overwrap other window\nwait 5 sec\nbringupbox test"
+strspecial s
+setdlgpos 0 0
+statusbox s "test statusbox"
+pause 5
+bringupbox
+statusbox "bringupbox" "test statusbox"
+pause 5
+closesbox
+setdlgpos -10000 0	  ; go center
+messagebox "finish statusbox setdlgpos test" "test statusbox"
+return
+
+;;;;;;;;;;;;;;;;
+;;; macrodialog box
+;;; show
+;;; - Dependence
+;;;		messagebox
+:test_macrodialogbox
+call test_macrodialogbox_show
+call test_macrodialogbox_move_resize
+messagebox "finish macro dialogbox test" "test macro dialogbox"
+return
+
+:test_macrodialogbox_show
+N = 5
+intdim show_flag_list N
+show_flag_list[0] = 1
+show_flag_list[1] = -1
+show_flag_list[2] = 1
+show_flag_list[3] = 0
+show_flag_list[4] = 1
+for i 0 N-1
+	show_flag = show_flag_list[i]
+	show show_flag
+	if show_flag < 0 then
+	   s = "macro dialog box was hidden\ncheck task bar"
+	elseif show_flag == 0 then
+	   s = "macro dialog box was minimize\ncheck task bar"
+	elseif show_flag > 0 then
+	   s = "macro dialog box was shown\nmove this messagebox and check macro dialog box"
+	endif
+	sprintf "show %d\n%s" show_flag s
+	s = inputstr
+	strspecial s
+	messagebox s "test macrodialog/show"
+next
+return
+
+:test_macrodialogbox_move_resize
+w = 15
+sprintf "move and resize test\nwait %d sec" w
+s = inputstr
+strspecial s
+messagebox s "test macro dialog"
+pause w
+messagebox "finish move and resize test" "test macro dialog/move and resize"
+return
+
+;;;;;;;;;;;;;;;;
+;;; listbox
+;;; - Dependence
+;;;		messagebox
+:test_listbox
+N = 7
+intdim done N
+strdim strs N
+strdim srcs N
+for i 0 N-1
+	done[i] = 0
+next
+srcs[0] = "本気の失敗には価値がある"
+srcs[1] = "俺の敵は　だいたい俺です"
+srcs[2] = "ちょっとだけ無理なことに挑戦してこーぜ"
+srcs[3] = "リーダーというのはやはり安心と興奮を同時にくれる"
+srcs[4] = "”止まる”も”進む”もコントロールするのはお前だ"
+srcs[5] = "どっちが楽しいかで決めなさい。"
+srcs[6] = "悩むなら、なってから悩みなさい"
+done_all = 0
+done_cancel = 0
+prev = 0
+while ((done_all == 0) or (done_cancel == 0))
+	for i 0 N-1
+		if done[i] == 0 then
+			s = ""
+		else
+			s = "[selected]"
+		endif
+		sprintf2 s "%s %s" s srcs[i]
+		strs[i] = s
+	next
+	if done_all == 0 then
+		msg = "select one from list and `ok`"
+		if done_cancel == 0 then
+			strconcat msg " or `cancel`"
+		endif
+	else
+		msg = "push `cancel`"
+	endif
+	listbox msg "test listbox" strs prev
+	if result < 0 then
+		done_cancel = 1
+		continue
+	endif
+	prev = result
+	if done[result] == 0 then
+		done[result] = 1
+	else
+		done[result] = 0
+	endif
+	done_all = 1
+	for i 0 N-1
+		if done[i] == 0 then
+			done_all = 0
+			break
+		endif
+	next
+endwhile
+messagebox "finish listbox test" "test listbox"
+return
+
+;;;;;;;;;;;;;;;;
+;;; filenamebox
+;;; - Dependence
+;;;		messagebox
+:test_filenamebox
+filenamebox "ファイルを選んでください(load)" 0 "c:\"
+sprintf2 s "result %d inputstr %s" result inputstr
+messagebox s "test fienamebox"
+filenamebox "ファイルを選んでください(save)" 1 "c:\windows"
+sprintf2 s "result %d inputstr %s" result inputstr
+messagebox s "test fienamebox"
+messagebox "finish filenaebox test" "test filenamebox"
+return
+
+;;;;;;;;;;;;;;;;
+;;; dirnamebox
+;;; - Dependence
+;;;		messagebox
+:test_dirnamebox
+dirnamebox "whereディレクトリ" "c:\"
+sprintf2 s "result %d inputstr %s" result inputstr
+messagebox s "test fienamebox"
+messagebox "finish dirnamebox test" "test dirnambox"
+return
+
+

Deleted: branches/ssh_auth_dialog/ttpmenu/ttpmenu.dsp
===================================================================
--- branches/ssh_auth_dialog/ttpmenu/ttpmenu.dsp	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/ttpmenu/ttpmenu.dsp	2019-04-24 14:08:16 UTC (rev 7613)
@@ -1,89 +0,0 @@
-# Microsoft Developer Studio Project File - Name="ttpmenu" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** \x95ҏW\x82\xB5\x82Ȃ\xA2\x82ł\xAD\x82\xBE\x82\xB3\x82\xA2 **
-
-# TARGTYPE "Win32 (x86) Application" 0x0101
-
-CFG=ttpmenu - Win32 Release
-!MESSAGE \x82\xB1\x82\xEA\x82͗L\x8C\xF8\x82\xC8Ҳ\xB8̧\xB2قł͂\xA0\x82\xE8\x82܂\xB9\x82\xF1\x81B \x82\xB1\x82\xCC\xCC\xDFۼު\xB8Ă\xF0\xCB\xDE\xD9\xC4ނ\xB7\x82邽\x82߂ɂ\xCD NMAKE \x82\xF0\x8Eg\x97p\x82\xB5\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2\x81B
-!MESSAGE [Ҳ\xB8̧\xB2ق̴\xB8\xBD\xCE߰\xC4] \xBA\xCF\xDD\xC4ނ\xF0\x8Eg\x97p\x82\xB5\x82Ď\xC0\x8Ds\x82\xB5\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2
-!MESSAGE 
-!MESSAGE NMAKE /f "ttpmenu.mak".
-!MESSAGE 
-!MESSAGE NMAKE \x82̎\xC0\x8Ds\x8E\x9E\x82ɍ\\x90\xAC\x82\xF0\x8Ew\x92\xE8\x82ł\xAB\x82܂\xB7
-!MESSAGE \xBA\xCF\xDD\xC4\xDE ײݏ\xE3\x82\xC5ϸۂ̐ݒ\xE8\x82\xF0\x92\xE8\x8B`\x82\xB5\x82܂\xB7\x81B\x97\xE1:
-!MESSAGE 
-!MESSAGE NMAKE /f "ttpmenu.mak" CFG="ttpmenu - Win32 Release"
-!MESSAGE 
-!MESSAGE \x91I\x91\xF0\x89\\x82\xC8\xCB\xDE\xD9\xC4\xDE Ӱ\xC4\xDE:
-!MESSAGE 
-!MESSAGE "ttpmenu - Win32 Release" ("Win32 (x86) Application" \x97p)
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O1 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
-# ADD BASE RSC /l 0x411 /d "NDEBUG"
-# ADD RSC /l 0x411 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib /nologo /subsystem:windows /machine:I386
-# Begin Target
-
-# Name "ttpmenu - Win32 Release"
-# Begin Source File
-
-SOURCE=.\left.ico
-# End Source File
-# Begin Source File
-
-SOURCE=.\registry.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\right.ico
-# End Source File
-# Begin Source File
-
-SOURCE=.\teraterm.ico
-# End Source File
-# Begin Source File
-
-SOURCE=.\ttpmenu.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\ttpmenu.ico
-# End Source File
-# Begin Source File
-
-SOURCE=.\ttpmenu.rc
-# End Source File
-# Begin Source File
-
-SOURCE=.\winmisc.cpp
-# End Source File
-# End Target
-# End Project

Deleted: branches/ssh_auth_dialog/ttpmenu/ttpmenu.dsw
===================================================================
--- branches/ssh_auth_dialog/ttpmenu/ttpmenu.dsw	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/ttpmenu/ttpmenu.dsw	2019-04-24 14:08:16 UTC (rev 7613)
@@ -1,29 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00
-# \x8Cx\x8D\x90: \x82\xB1\x82\xCCܰ\xB8\xBD\xCD߰\xBD ̧\xB2\xD9 \x82\xF0\x95ҏW\x82܂\xBD\x82͍폜\x82\xB5\x82Ȃ\xA2\x82ł\xAD\x82\xBE\x82\xB3\x82\xA2!
-
-###############################################################################
-
-Project: "ttpmenu"=.\ttpmenu.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-

Modified: branches/ssh_auth_dialog/ttpmenu/ttpmenu.rc
===================================================================
--- branches/ssh_auth_dialog/ttpmenu/ttpmenu.rc	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/ttpmenu/ttpmenu.rc	2019-04-24 14:08:16 UTC (rev 7613)
@@ -7,7 +7,7 @@
 //
 // Generated from the TEXTINCLUDE 2 resource.
 //
-#include "afxres.h"
+#include <windows.h>
 
 /////////////////////////////////////////////////////////////////////////////
 #undef APSTUDIO_READONLY_SYMBOLS

Modified: branches/ssh_auth_dialog/ttpmenu/ttpmenu.v10.vcxproj
===================================================================
--- branches/ssh_auth_dialog/ttpmenu/ttpmenu.v10.vcxproj	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/ttpmenu/ttpmenu.v10.vcxproj	2019-04-24 14:08:16 UTC (rev 7613)
@@ -113,7 +113,9 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClCompile Include="..\teraterm\common\codeconv.cpp" />
     <ClCompile Include="..\teraterm\common\i18n.c" />
+    <ClCompile Include="..\teraterm\common\ttlib.c" />
     <ClCompile Include="registry.cpp">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">MinSpace</Optimization>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -120,7 +122,6 @@
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MinSpace</Optimization>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <ClCompile Include="..\teraterm\common\ttlib.c" />
     <ClCompile Include="ttpmenu.cpp">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">MinSpace</Optimization>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -141,7 +142,10 @@
     <None Include="ttpmenu.ico" />
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="..\teraterm\common\codeconv.h" />
+    <ClInclude Include="..\teraterm\common\i18n.h" />
     <ClInclude Include="resource.h" />
+    <ClInclude Include="ttpmenu.h" />
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="ttpmenu.rc" />

Modified: branches/ssh_auth_dialog/ttpmenu/ttpmenu.v11.vcxproj
===================================================================
--- branches/ssh_auth_dialog/ttpmenu/ttpmenu.v11.vcxproj	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/ttpmenu/ttpmenu.v11.vcxproj	2019-04-24 14:08:16 UTC (rev 7613)
@@ -117,12 +117,13 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClCompile Include="..\teraterm\common\codeconv.cpp" />
     <ClCompile Include="..\teraterm\common\i18n.c" />
+    <ClCompile Include="..\teraterm\common\ttlib.c" />
     <ClCompile Include="registry.cpp">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">MinSpace</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MinSpace</Optimization>
     </ClCompile>
-    <ClCompile Include="..\teraterm\common\ttlib.c" />
     <ClCompile Include="ttpmenu.cpp">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">MinSpace</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MinSpace</Optimization>
@@ -139,7 +140,10 @@
     <Image Include="ttpmenu.ico" />
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="..\teraterm\common\codeconv.h" />
+    <ClInclude Include="..\teraterm\common\i18n.h" />
     <ClInclude Include="resource.h" />
+    <ClInclude Include="ttpmenu.h" />
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="ttpmenu.rc" />

Modified: branches/ssh_auth_dialog/ttpmenu/ttpmenu.v12.vcxproj
===================================================================
--- branches/ssh_auth_dialog/ttpmenu/ttpmenu.v12.vcxproj	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/ttpmenu/ttpmenu.v12.vcxproj	2019-04-24 14:08:16 UTC (rev 7613)
@@ -117,6 +117,7 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClCompile Include="..\teraterm\common\codeconv.cpp" />
     <ClCompile Include="..\teraterm\common\i18n.c" />
     <ClCompile Include="..\teraterm\common\ttlib.c" />
     <ClCompile Include="registry.cpp">
@@ -139,7 +140,10 @@
     <Image Include="ttpmenu.ico" />
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="..\teraterm\common\codeconv.h" />
+    <ClInclude Include="..\teraterm\common\i18n.h" />
     <ClInclude Include="resource.h" />
+    <ClInclude Include="ttpmenu.h" />
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="ttpmenu.rc" />

Modified: branches/ssh_auth_dialog/ttpmenu/ttpmenu.v14.vcxproj
===================================================================
--- branches/ssh_auth_dialog/ttpmenu/ttpmenu.v14.vcxproj	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/ttpmenu/ttpmenu.v14.vcxproj	2019-04-24 14:08:16 UTC (rev 7613)
@@ -117,6 +117,7 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClCompile Include="..\teraterm\common\codeconv.cpp" />
     <ClCompile Include="..\teraterm\common\i18n.c" />
     <ClCompile Include="..\teraterm\common\ttlib.c" />
     <ClCompile Include="registry.cpp">
@@ -139,7 +140,10 @@
     <Image Include="ttpmenu.ico" />
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="..\teraterm\common\codeconv.h" />
+    <ClInclude Include="..\teraterm\common\i18n.h" />
     <ClInclude Include="resource.h" />
+    <ClInclude Include="ttpmenu.h" />
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="ttpmenu.rc" />

Modified: branches/ssh_auth_dialog/ttpmenu/ttpmenu.v15.vcxproj
===================================================================
--- branches/ssh_auth_dialog/ttpmenu/ttpmenu.v15.vcxproj	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/ttpmenu/ttpmenu.v15.vcxproj	2019-04-24 14:08:16 UTC (rev 7613)
@@ -117,6 +117,7 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClCompile Include="..\teraterm\common\codeconv.cpp" />
     <ClCompile Include="..\teraterm\common\i18n.c" />
     <ClCompile Include="..\teraterm\common\ttlib.c" />
     <ClCompile Include="registry.cpp">
@@ -139,7 +140,10 @@
     <Image Include="ttpmenu.ico" />
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="..\teraterm\common\codeconv.h" />
+    <ClInclude Include="..\teraterm\common\i18n.h" />
     <ClInclude Include="resource.h" />
+    <ClInclude Include="ttpmenu.h" />
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="ttpmenu.rc" />

Added: branches/ssh_auth_dialog/ttpmenu/ttpmenu.v16.sln
===================================================================
--- branches/ssh_auth_dialog/ttpmenu/ttpmenu.v16.sln	                        (rev 0)
+++ branches/ssh_auth_dialog/ttpmenu/ttpmenu.v16.sln	2019-04-24 14:08:16 UTC (rev 7613)
@@ -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/ssh_auth_dialog/ttpmenu/ttpmenu.v16.vcxproj (from rev 7520, branches/ssh_auth_dialog/ttpmenu/ttpmenu.v15.vcxproj)
===================================================================
--- branches/ssh_auth_dialog/ttpmenu/ttpmenu.v16.vcxproj	                        (rev 0)
+++ branches/ssh_auth_dialog/ttpmenu/ttpmenu.v16.vcxproj	2019-04-24 14:08:16 UTC (rev 7613)
@@ -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/ssh_auth_dialog/ttpmenu/ttpmenu.v9.vcproj
===================================================================
--- branches/ssh_auth_dialog/ttpmenu/ttpmenu.v9.vcproj	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/ttpmenu/ttpmenu.v9.vcproj	2019-04-24 14:08:16 UTC (rev 7613)
@@ -193,6 +193,14 @@
 	</References>
 	<Files>
 		<File
+			RelativePath="..\teraterm\common\codeconv.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\teraterm\common\codeconv.h"
+			>
+		</File>
+		<File
 			RelativePath="..\teraterm\common\i18n.c"
 			>
 		</File>

Modified: branches/ssh_auth_dialog/ttpmenu/ttpmenu.vcproj
===================================================================
--- branches/ssh_auth_dialog/ttpmenu/ttpmenu.vcproj	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/ttpmenu/ttpmenu.vcproj	2019-04-24 14:08:16 UTC (rev 7613)
@@ -69,7 +69,7 @@
 			/>
 			<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"
 				GenerateDebugInformation="true"
@@ -157,7 +157,7 @@
 			/>
 			<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"
 				GenerateDebugInformation="true"
@@ -194,6 +194,14 @@
 	</References>
 	<Files>
 		<File
+			RelativePath="..\teraterm\common\codeconv.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\teraterm\common\codeconv.h"
+			>
+		</File>
+		<File
 			RelativePath="..\teraterm\common\i18n.c"
 			>
 		</File>

Deleted: branches/ssh_auth_dialog/ttssh2/matcher/matcher.dsp
===================================================================
--- branches/ssh_auth_dialog/ttssh2/matcher/matcher.dsp	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/ttssh2/matcher/matcher.dsp	2019-04-24 14:08:16 UTC (rev 7613)
@@ -1,92 +0,0 @@
-# Microsoft Developer Studio Project File - Name="matcher" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=matcher - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "matcher.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "matcher.mak" CFG="matcher - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "matcher - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "matcher - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "matcher - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-
-!ELSEIF  "$(CFG)" == "matcher - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-
-!ENDIF 
-
-# Begin Target
-
-# Name "matcher - Win32 Release"
-# Name "matcher - Win32 Debug"
-# Begin Source File
-
-SOURCE=.\matcher.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\test.c
-# End Source File
-# End Target
-# End Project

Copied: branches/ssh_auth_dialog/ttssh2/matcher/matcher.v16.vcxproj (from rev 7520, branches/ssh_auth_dialog/ttpmenu/ttpmenu.v15.vcxproj)
===================================================================
--- branches/ssh_auth_dialog/ttssh2/matcher/matcher.v16.vcxproj	                        (rev 0)
+++ branches/ssh_auth_dialog/ttssh2/matcher/matcher.v16.vcxproj	2019-04-24 14:08:16 UTC (rev 7613)
@@ -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

Modified: branches/ssh_auth_dialog/ttssh2/putty/CMakeLists.txt
===================================================================
--- branches/ssh_auth_dialog/ttssh2/putty/CMakeLists.txt	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/ttssh2/putty/CMakeLists.txt	2019-04-24 14:08:16 UTC (rev 7613)
@@ -6,14 +6,29 @@
   add_definitions("-D_WINDOWS")
 endif()
 
-set(SRC
+set(PUTTY_SRC
+  ../../libs/putty/putty.h
+  ../../libs/putty/pageant.h
   ../../libs/putty/conf.c
+  ../../libs/putty/misc.h
   ../../libs/putty/misc.c
+  ../../libs/putty/tree234.h
   ../../libs/putty/tree234.c
+  ../../libs/putty/version.h
   ../../libs/putty/version.c
   ../../libs/putty/windows/winmisc.c
   ../../libs/putty/windows/winpgntc.c
+  ../../libs/putty/windows/winsecur.h
   ../../libs/putty/windows/winsecur.c
+  )
+
+source_group(
+  "putty"
+  FILES
+  ${PUTTY_SRC}
+  )
+
+set(SRC
   libputty.c
   libputty.h
   )
@@ -27,4 +42,5 @@
 add_library(
   libputty
   ${SRC}
+  ${PUTTY_SRC}
   )

Copied: branches/ssh_auth_dialog/ttssh2/putty/putty.v16.vcxproj (from rev 7520, branches/ssh_auth_dialog/TTXSamples/TTXViewMode/TTXViewMode.v15.vcxproj)
===================================================================
--- branches/ssh_auth_dialog/ttssh2/putty/putty.v16.vcxproj	                        (rev 0)
+++ branches/ssh_auth_dialog/ttssh2/putty/putty.v16.vcxproj	2019-04-24 14:08:16 UTC (rev 7613)
@@ -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/ssh_auth_dialog/ttssh2/putty/putty.v16.vcxproj.filters
===================================================================
--- branches/ssh_auth_dialog/ttssh2/putty/putty.v16.vcxproj.filters	                        (rev 0)
+++ branches/ssh_auth_dialog/ttssh2/putty/putty.v16.vcxproj.filters	2019-04-24 14:08:16 UTC (rev 7613)
@@ -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/ssh_auth_dialog/ttssh2/puttyrev/puttyrev.v16.vcxproj (from rev 7520, branches/ssh_auth_dialog/TTXSamples/TTXViewMode/TTXViewMode.v15.vcxproj)
===================================================================
--- branches/ssh_auth_dialog/ttssh2/puttyrev/puttyrev.v16.vcxproj	                        (rev 0)
+++ branches/ssh_auth_dialog/ttssh2/puttyrev/puttyrev.v16.vcxproj	2019-04-24 14:08:16 UTC (rev 7613)
@@ -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/ssh_auth_dialog/ttssh2/puttyrev/puttyrev.v16.vcxproj.filters
===================================================================
--- branches/ssh_auth_dialog/ttssh2/puttyrev/puttyrev.v16.vcxproj.filters	                        (rev 0)
+++ branches/ssh_auth_dialog/ttssh2/puttyrev/puttyrev.v16.vcxproj.filters	2019-04-24 14:08:16 UTC (rev 7613)
@@ -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

Deleted: branches/ssh_auth_dialog/ttssh2/ttssh/ttssh.dsp
===================================================================
--- branches/ssh_auth_dialog/ttssh2/ttssh/ttssh.dsp	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/ttssh2/ttssh/ttssh.dsp	2019-04-24 14:08:16 UTC (rev 7613)
@@ -1,103 +0,0 @@
-# Microsoft Developer Studio Project File - Name="ttssh" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Application" 0x0101
-
-CFG=ttssh - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "ttssh.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "ttssh.mak" CFG="ttssh - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "ttssh - Win32 Release" (based on "Win32 (x86) Application")
-!MESSAGE "ttssh - Win32 Debug" (based on "Win32 (x86) Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "ttssh - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O1 /Ob2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386
-
-!ELSEIF  "$(CFG)" == "ttssh - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-
-!ENDIF 
-
-# Begin Target
-
-# Name "ttssh - Win32 Release"
-# Name "ttssh - Win32 Debug"
-# Begin Source File
-
-SOURCE=.\ttsecure.ico
-# End Source File
-# Begin Source File
-
-SOURCE=.\ttssh.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\ttssh.rc
-# End Source File
-# End Target
-# End Project

Modified: branches/ssh_auth_dialog/ttssh2/ttssh/ttssh.rc
===================================================================
--- branches/ssh_auth_dialog/ttssh2/ttssh/ttssh.rc	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/ttssh2/ttssh/ttssh.rc	2019-04-24 14:08:16 UTC (rev 7613)
@@ -7,7 +7,8 @@
 //
 // Generated from the TEXTINCLUDE 2 resource.
 //
-#include "afxres.h"
+//#include "afxres.h"
+#include <windows.h>
 
 /////////////////////////////////////////////////////////////////////////////
 #undef APSTUDIO_READONLY_SYMBOLS

Copied: branches/ssh_auth_dialog/ttssh2/ttssh/ttssh.v16.vcxproj (from rev 7520, branches/ssh_auth_dialog/ttpmenu/ttpmenu.v15.vcxproj)
===================================================================
--- branches/ssh_auth_dialog/ttssh2/ttssh/ttssh.v16.vcxproj	                        (rev 0)
+++ branches/ssh_auth_dialog/ttssh2/ttssh/ttssh.v16.vcxproj	2019-04-24 14:08:16 UTC (rev 7613)
@@ -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

Deleted: branches/ssh_auth_dialog/ttssh2/ttssh.dsw
===================================================================
--- branches/ssh_auth_dialog/ttssh2/ttssh.dsw	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/ttssh2/ttssh.dsw	2019-04-24 14:08:16 UTC (rev 7613)
@@ -1,68 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "matcher"=.\matcher\matcher.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "ttssh"=.\ttssh\ttssh.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "ttxssh"=.\ttxssh\ttxssh.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name zlib
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "zlib"=.\zlib\zlib.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-

Deleted: branches/ssh_auth_dialog/ttssh2/ttssh.opt
===================================================================
(Binary files differ)

Added: branches/ssh_auth_dialog/ttssh2/ttssh.v16.sln
===================================================================
--- branches/ssh_auth_dialog/ttssh2/ttssh.v16.sln	                        (rev 0)
+++ branches/ssh_auth_dialog/ttssh2/ttssh.v16.sln	2019-04-24 14:08:16 UTC (rev 7613)
@@ -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/ssh_auth_dialog/ttssh2/ttxssh/CMakeLists.txt
===================================================================
--- branches/ssh_auth_dialog/ttssh2/ttxssh/CMakeLists.txt	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/ttssh2/ttxssh/CMakeLists.txt	2019-04-24 14:08:16 UTC (rev 7613)
@@ -14,7 +14,11 @@
   ../../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
+  ../../teraterm/common/dlglib_tmpl.cpp
   ../../teraterm/common/servicenames.h
   ../../teraterm/common/codeconv.cpp
   ../../teraterm/common/codeconv.h
@@ -117,6 +121,12 @@
   ${SRC}
   )
 
+set_target_properties(
+  ttxssh
+  PROPERTIES
+  PREFIX ""
+  )
+
 target_link_libraries(
   ttxssh
   libputty
@@ -134,6 +144,11 @@
 
 ### create puttyversion.h
 
+set(PUTTY_ISS "${CMAKE_SOURCE_DIR}/libs/putty/windows/putty.iss")
+if(NOT EXISTS ${PUTTY_ISS})
+  message(FATAL_ERROR "${PUTTY_ISS} not found")
+endif()
+
 file(READ "${CMAKE_SOURCE_DIR}/libs/putty/windows/putty.iss" iis)
 
 string(REGEX MATCH "VersionInfoTextVersion=([^\n]+)\n" _ ${iis})

Modified: branches/ssh_auth_dialog/ttssh2/ttxssh/auth.c
===================================================================
--- branches/ssh_auth_dialog/ttssh2/ttxssh/auth.c	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/ttssh2/ttxssh/auth.c	2019-04-24 14:08:16 UTC (rev 7613)
@@ -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
@@ -32,6 +32,7 @@
 #include "ssh.h"
 #include "key.h"
 #include "ttlib.h"
+#include "dlglib.h"
 
 #include <io.h>
 #include <fcntl.h>
@@ -38,20 +39,34 @@
 #include <stdlib.h>
 #include <errno.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)
+#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
 
-static HFONT DlgAuthFont;
-static HFONT DlgTisFont;
-static HFONT DlgAuthSetupFont;
+#undef DialogBoxParam
+#define DialogBoxParam(p1,p2,p3,p4,p5) \
+	TTDialogBoxParam(p1,p2,p3,p4,p5)
+#undef EndDialog
+#define EndDialog(p1,p2) \
+	TTEndDialog(p1, p2)
 
+//static HFONT DlgAuthFont;
+//static HFONT DlgTisFont;
+//static HFONT DlgAuthSetupFont;
+
 void destroy_malloced_string(char **str)
 {
 	if (*str != NULL) {
@@ -66,12 +81,19 @@
 	IDC_SSHUSERHOSTS, IDC_SSHUSETIS, -1,
 	-1, -1, -1, -1, -1, -1, -1, -1, -1, IDC_SSHUSEPAGEANT, -1
 };
-static TipWin *tipwin;
 static BOOL UseControlChar = TRUE;
 
-LRESULT CALLBACK password_wnd_proc(HWND control, UINT msg,
-                                   WPARAM wParam, LPARAM lParam)
+typedef struct {
+	WNDPROC ProcOrg;
+	PTInstVar pvar;
+	TipWin *tipwin;
+} TPasswordControlData;
+
+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 (!UseControlChar) {
@@ -84,58 +106,56 @@
 			SendMessage(control, EM_REPLACESEL, (WPARAM) TRUE,
 			            (LPARAM) (TCHAR *) chars);
 
-			if (tipwin == NULL) {
+			if (data->tipwin == NULL) {
 				TCHAR uimsg[MAX_UIMSG];
 				RECT rect;
-				const TCHAR *s;
-				s = _T("\x90\xA7\x8C䕶\x8E\x9A\x82\xAA\x93\xFC\x97͂\xB3\x82\xEA\x82܂\xB5\x82\xBD")
-					_T("\n")
-					_T("\x89p\x8C\xEA:")
-					_T("\n")
-					_T("control character is entered");
-				_tcscpy_s(uimsg, _countof(uimsg), s);
+				PTInstVar pvar = data->pvar;
+				UTIL_get_lang_msg("DLG_AUTH_TIP_CONTROL_CODE", pvar, "control character is entered");
+				_tcscpy_s(uimsg, _countof(uimsg), pvar->ts->UIMsg);
 				if (wParam == 'V' - 'A' + 1) {
 					// CTRL + V
-					s = _T("\n")
-						_T("Shift+Insert\x82ŃN\x83\x8A\x83b\x83v\x83{\x81[\x83h\x82\xA9\x82\xE7\x83y\x81[\x83X\x83g\x82ł\xAB\x82܂\xB7")
-						_T("\n")
-						_T("\x89p\x8C\xEA:")
-						_T("\n")
-						_T("Use Shift + Insert to paste from clipboard");
-						_tcscat_s(uimsg, _countof(uimsg), s);
+					_tcscat_s(uimsg, _countof(uimsg), _T("\n"));
+					UTIL_get_lang_msg("DLG_AUTH_TIP_PASTE_KEY", pvar, "Use Shift + Insert to paste from clipboard");
+					_tcscat_s(uimsg, _countof(uimsg), pvar->ts->UIMsg);
 				}
 				GetWindowRect(control, &rect);
-				tipwin = TipWinCreate(control, rect.left, rect.bottom, uimsg);
+				data->tipwin = TipWinCreate(control, rect.left, rect.bottom, uimsg);
 			}
 
 			return 0;
 		} else {
-			if (tipwin != NULL) {
-				TipWinDestroy(tipwin);
-				tipwin = NULL;
+			if (data->tipwin != NULL) {
+				TipWinDestroy(data->tipwin);
+				data->tipwin = NULL;
 			}
 		}
 		break;
-	case WM_NCDESTROY:
-		if (tipwin != NULL) {
-			TipWinDestroy(tipwin);
-			tipwin = NULL;
+	}
+
+	result = CallWindowProc((WNDPROC)data->ProcOrg,
+							control, msg, wParam, lParam);
+
+	if (msg == WM_NCDESTROY) {
+		SetWindowLongPtr(control, GWLP_WNDPROC, (LONG_PTR)data->ProcOrg);
+		if (data->tipwin != NULL) {
+			TipWinDestroy(data->tipwin);
+			data->tipwin = NULL;
 		}
-		break;
+		free(data);
 	}
 
-	return CallWindowProc((WNDPROC) GetWindowLong(control, GWL_USERDATA),
-	                      control, msg, wParam, lParam);
+	return result;
 }
 
-static void init_password_control(HWND dlg)
+void init_password_control(PTInstVar pvar, HWND dlg, int item)
 {
-	HWND passwordControl = GetDlgItem(dlg, IDC_SSHPASSWORD);
-
-	SetWindowLong(passwordControl, GWL_USERDATA,
-	              SetWindowLong(passwordControl, GWL_WNDPROC,
-	                            (LONG) 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;
+	SetWindowLongPtr(passwordControl, GWLP_WNDPROC, (LONG_PTR)password_wnd_proc);
+	SetWindowLongPtr(passwordControl, GWLP_USERDATA, (LONG_PTR)data);
 	SetFocus(passwordControl);
 }
 
@@ -277,7 +297,7 @@
 	SetDlgItemText(dlg, IDCANCEL, pvar->ts->UIMsg);
 
 	init_auth_machine_banner(pvar, dlg);
-	init_password_control(dlg);
+	init_password_control(pvar, dlg, IDC_SSHPASSWORD);
 
 	// \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) {
@@ -718,9 +738,11 @@
 	}
 
 	EndDialog(dlg, 1);
+#if 0
 	if (DlgAuthFont != NULL) {
 		DeleteObject(DlgAuthFont);
 	}
+#endif
 
 	return TRUE;
 }
@@ -774,8 +796,8 @@
 	const int IDC_TIMER3 = 302; // challenge \x82\xC5 ask4passwd \x82\xC5CheckAuthListFirst \x82\xAA FALSE \x82̂Ƃ\xAB
 	const int autologin_timeout = 10; // \x83~\x83\x8A\x95b
 	PTInstVar pvar;
-	LOGFONT logfont;
-	HFONT font;
+//	LOGFONT logfont;
+//	HFONT font;
 
 	switch (msg) {
 	case WM_INITDIALOG:
@@ -784,7 +806,7 @@
 		SetWindowLong(dlg, DWL_USER, lParam);
 
 		init_auth_dlg(pvar, dlg);
-
+#if 0
 		font = (HFONT)SendMessage(dlg, WM_GETFONT, 0, 0);
 		GetObject(font, sizeof(LOGFONT), &logfont);
 		if (UTIL_get_lang_font("DLG_TAHOMA_FONT", dlg, &logfont, &DlgAuthFont, pvar)) {
@@ -813,6 +835,7 @@
 		else {
 			DlgAuthFont = NULL;
 		}
+#endif
 		UseControlChar = TRUE;
 		CheckDlgButton(dlg, IDC_USE_CONTROL_CHARACTER, UseControlChar ? BST_CHECKED : BST_UNCHECKED);
 		CheckDlgButton(dlg, IDC_CLEAR_CLIPBOARD, BST_UNCHECKED);
@@ -838,6 +861,7 @@
 				SetTimer(dlg, IDC_TIMER3, autologin_timeout, 0);
 			}
 		}
+		CenterWindow(dlg, GetParent(dlg));
 		return FALSE;			/* because we set the focus */
 
 	case WM_TIMER:
@@ -962,11 +986,11 @@
 			pvar->auth_state.auth_dialog = NULL;
 			notify_closed_connection(pvar, "authentication cancelled");
 			EndDialog(dlg, 0);
-
+#if 0
 			if (DlgAuthFont != NULL) {
 				DeleteObject(DlgAuthFont);
 			}
-
+#endif
 			return TRUE;
 
 		case IDC_SSHUSERNAME:
@@ -1253,7 +1277,7 @@
 	SetDlgItemText(dlg, IDCANCEL, pvar->ts->UIMsg);
 
 	init_auth_machine_banner(pvar, dlg);
-	init_password_control(dlg);
+	init_password_control(pvar, dlg, IDC_SSHPASSWORD);
 
 	if (pvar->auth_state.TIS_prompt != NULL) {
 		if (strlen(pvar->auth_state.TIS_prompt) > 10000) {
@@ -1294,8 +1318,8 @@
                                   LPARAM lParam)
 {
 	PTInstVar pvar;
-	LOGFONT logfont;
-	HFONT font;
+//	LOGFONT logfont;
+//	HFONT font;
 
 	switch (msg) {
 	case WM_INITDIALOG:
@@ -1304,7 +1328,7 @@
 		SetWindowLong(dlg, DWL_USER, lParam);
 
 		init_TIS_dlg(pvar, dlg);
-
+#if 0
 		font = (HFONT)SendMessage(dlg, WM_GETFONT, 0, 0);
 		GetObject(font, sizeof(LOGFONT), &logfont);
 		if (UTIL_get_lang_font("DLG_TAHOMA_FONT", dlg, &logfont, &DlgTisFont, pvar)) {
@@ -1317,7 +1341,7 @@
 		else {
 			DlgTisFont = NULL;
 		}
-
+#endif
 		// /auth=challenge \x82\xF0\x92ǉ\xC1 (2007.10.5 maya)
 		if (pvar->ssh2_autologin == 1) {
 			SetDlgItemText(dlg, IDC_SSHPASSWORD, pvar->ssh2_password);
@@ -1324,6 +1348,7 @@
 			SendMessage(dlg, WM_COMMAND, IDOK, 0);
 		}
 
+		CenterWindow(dlg, GetParent(dlg));
 		return FALSE;			/* because we set the focus */
 
 	case WM_COMMAND:
@@ -1331,10 +1356,11 @@
 
 		switch (LOWORD(wParam)) {
 		case IDOK:
+#if 0
 			if (DlgTisFont != NULL) {
 				DeleteObject(DlgTisFont);
 			}
-
+#endif
 			return end_TIS_dlg(pvar, dlg);
 
 		case IDCANCEL:			/* kill the connection */
@@ -1341,11 +1367,11 @@
 			pvar->auth_state.auth_dialog = NULL;
 			notify_closed_connection(pvar, "authentication cancelled");
 			EndDialog(dlg, 0);
-
+#if 0
 			if (DlgTisFont != NULL) {
 				DeleteObject(DlgTisFont);
 			}
-
+#endif
 			return TRUE;
 
 		default:
@@ -1516,8 +1542,8 @@
 										   WPARAM wParam, LPARAM lParam)
 {
 	PTInstVar pvar;
-	LOGFONT logfont;
-	HFONT font;
+//	LOGFONT logfont;
+//	HFONT font;
 
 	switch (msg) {
 	case WM_INITDIALOG:
@@ -1525,7 +1551,7 @@
 		SetWindowLong(dlg, DWL_USER, lParam);
 
 		init_default_auth_dlg(pvar, dlg);
-
+#if 0
 		font = (HFONT)SendMessage(dlg, WM_GETFONT, 0, 0);
 		GetObject(font, sizeof(LOGFONT), &logfont);
 		if (UTIL_get_lang_font("DLG_TAHOMA_FONT", dlg, &logfont, &DlgAuthSetupFont, pvar)) {
@@ -1550,7 +1576,8 @@
 		else {
 			DlgAuthSetupFont = NULL;
 		}
-
+#endif
+		CenterWindow(dlg, GetParent(dlg));
 		return TRUE;			/* because we do not set the focus */
 
 	case WM_COMMAND:
@@ -1558,20 +1585,20 @@
 
 		switch (LOWORD(wParam)) {
 		case IDOK:
-
+#if 0
 			if (DlgAuthSetupFont != NULL) {
 				DeleteObject(DlgAuthSetupFont);
 			}
-
+#endif
 			return end_default_auth_dlg(pvar, dlg);
 
 		case IDCANCEL:
 			EndDialog(dlg, 0);
-
+#if 0
 			if (DlgAuthSetupFont != NULL) {
 				DeleteObject(DlgAuthSetupFont);
 			}
-
+#endif
 			return TRUE;
 
 		case IDC_CHOOSERSAFILE:

Modified: branches/ssh_auth_dialog/ttssh2/ttxssh/auth.h
===================================================================
--- branches/ssh_auth_dialog/ttssh2/ttxssh/auth.h	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/ttssh2/ttxssh/auth.h	2019-04-24 14:08:16 UTC (rev 7613)
@@ -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);
 
 #define AUTH_get_cur_cred(pvar) (&(pvar)->auth_state.cur_cred)
 

Modified: branches/ssh_auth_dialog/ttssh2/ttxssh/buffer.c
===================================================================
--- branches/ssh_auth_dialog/ttssh2/ttxssh/buffer.c	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/ttssh2/ttxssh/buffer.c	2019-04-24 14:08:16 UTC (rev 7613)
@@ -38,6 +38,10 @@
 #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)

Modified: branches/ssh_auth_dialog/ttssh2/ttxssh/fwd-socks.c
===================================================================
--- branches/ssh_auth_dialog/ttssh2/ttxssh/fwd-socks.c	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/ttssh2/ttxssh/fwd-socks.c	2019-04-24 14:08:16 UTC (rev 7613)
@@ -65,6 +65,10 @@
 #define SOCKS5_ERROR_COMMAND     129
 #define SOCKS5_ERROR_ADDRTYPE    130
 
+#if defined(__MINGW32__)
+#define __FUNCTION__
+#endif
+
 typedef struct {
 	PTInstVar pvar;
 

Modified: branches/ssh_auth_dialog/ttssh2/ttxssh/fwd.c
===================================================================
--- branches/ssh_auth_dialog/ttssh2/ttxssh/fwd.c	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/ttssh2/ttxssh/fwd.c	2019-04-24 14:08:16 UTC (rev 7613)
@@ -47,6 +47,10 @@
 
 #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);
 

Modified: branches/ssh_auth_dialog/ttssh2/ttxssh/fwdui.c
===================================================================
--- branches/ssh_auth_dialog/ttssh2/ttxssh/fwdui.c	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/ttssh2/ttxssh/fwdui.c	2019-04-24 14:08:16 UTC (rev 7613)
@@ -37,12 +37,20 @@
 #include "resource.h"
 #include "x11util.h"
 #include "util.h"
+#include "dlglib.h"
 
 #include "servicenames.h"
 
-static HFONT DlgFwdEditFont;
-static HFONT DlgFwdFont;
+#undef DialogBoxParam
+#define DialogBoxParam(p1,p2,p3,p4,p5) \
+	TTDialogBoxParam(p1,p2,p3,p4,p5)
+#undef EndDialog
+#define EndDialog(p1,p2) \
+	TTEndDialog(p1, p2)
 
+//static HFONT DlgFwdEditFont;
+//static HFONT DlgFwdFont;
+
 typedef struct {
 	FWDRequestSpec *spec;
 	PTInstVar pvar;
@@ -975,8 +983,8 @@
 {
 	FWDEditClosure *closure;
 	PTInstVar pvar;
-	LOGFONT logfont;
-	HFONT font;
+//	LOGFONT logfont;
+//	HFONT font;
 	BOOL result;
 
 	switch (msg) {
@@ -986,7 +994,7 @@
 
 		pvar = closure->pvar;
 		init_fwd_edit_dlg(pvar, closure->spec, dlg);
-
+#if 0
 		font = (HFONT)SendMessage(dlg, WM_GETFONT, 0, 0);
 		GetObject(font, sizeof(LOGFONT), &logfont);
 		if (UTIL_get_lang_font("DLG_TAHOMA_FONT", dlg, &logfont, &DlgFwdEditFont, pvar)) {
@@ -1017,6 +1025,8 @@
 		else {
 			DlgFwdEditFont = NULL;
 		}
+#endif
+		CenterWindow(dlg, GetParent(dlg));
 		return FALSE;			/* because we set the focus */
 
 	case WM_COMMAND:
@@ -1028,9 +1038,11 @@
 			result = end_fwd_edit_dlg(closure->pvar, closure->spec, dlg);
 
 			if (result) {
+#if 0
 				if (DlgFwdEditFont != NULL) {
 					DeleteObject(DlgFwdEditFont);
 				}
+#endif
 			}
 
 			return result;
@@ -1037,11 +1049,11 @@
 
 		case IDCANCEL:
 			EndDialog(dlg, 0);
-
+#if 0
 			if (DlgFwdEditFont != NULL) {
 				DeleteObject(DlgFwdEditFont);
 			}
-
+#endif
 			return TRUE;
 
 		case IDC_SSHFWDLOCALTOREMOTE:
@@ -1140,8 +1152,8 @@
                                   LPARAM lParam)
 {
 	PTInstVar pvar;
-	LOGFONT logfont;
-	HFONT font;
+//	LOGFONT logfont;
+//	HFONT font;
 	BOOL ret;
 
 	switch (msg) {
@@ -1150,7 +1162,7 @@
 		SetWindowLong(dlg, DWL_USER, lParam);
 
 		init_fwd_dlg(pvar, dlg);
-
+#if 0
 		font = (HFONT)SendMessage(dlg, WM_GETFONT, 0, 0);
 		GetObject(font, sizeof(LOGFONT), &logfont);
 		if (UTIL_get_lang_font("DLG_TAHOMA_FONT", dlg, &logfont, &DlgFwdFont, pvar)) {
@@ -1167,7 +1179,8 @@
 		else {
 			DlgFwdFont = NULL;
 		}
-
+#endif
+		CenterWindow(dlg, GetParent(dlg));
 		return TRUE;			/* because we do not set the focus */
 
 	case WM_COMMAND:
@@ -1177,21 +1190,21 @@
 		case IDOK:
 
 			ret = end_fwd_dlg(pvar, dlg);
-
+#if 0
 			if (ret == TRUE && DlgFwdFont != NULL) {
 				DeleteObject(DlgFwdFont);
 			}
-
+#endif
 			return ret;
 
 		case IDCANCEL:
 			free_all_listbox_specs(dlg);
 			EndDialog(dlg, 0);
-
+#if 0
 			if (DlgFwdFont != NULL) {
 				DeleteObject(DlgFwdFont);
 			}
-
+#endif
 			return TRUE;
 
 		case IDC_ADD:

Modified: branches/ssh_auth_dialog/ttssh2/ttxssh/hosts.c
===================================================================
--- branches/ssh_auth_dialog/ttssh2/ttxssh/hosts.c	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/ttssh2/ttxssh/hosts.c	2019-04-24 14:08:16 UTC (rev 7613)
@@ -39,6 +39,7 @@
 #include "key.h"
 #include "hosts.h"
 #include "dns.h"
+#include "dlglib.h"
 
 #include <openssl/bn.h>
 #include <openssl/evp.h>
@@ -53,9 +54,16 @@
 #include <memory.h>
 
 
-static HFONT DlgHostsAddFont;
-static HFONT DlgHostsReplaceFont;
+#undef DialogBoxParam
+#define DialogBoxParam(p1,p2,p3,p4,p5) \
+	TTDialogBoxParam(p1,p2,p3,p4,p5)
+#undef EndDialog
+#define EndDialog(p1,p2) \
+	TTEndDialog(p1, p2)
 
+//static HFONT DlgHostsAddFont;
+//static HFONT DlgHostsReplaceFont;
+
 // BASE64\x8D\\x90\xAC\x95\xB6\x8E\x9A\x97\xF1\x81i\x82\xB1\x82\xB1\x82ł\xCD'='\x82͊܂܂\xEA\x82Ă\xA2\x82Ȃ\xA2\x81j
 static char base64[] ="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
 
@@ -1702,8 +1710,8 @@
                                         LPARAM lParam)
 {
 	PTInstVar pvar;
-	LOGFONT logfont;
-	HFONT font;
+//	LOGFONT logfont;
+//	HFONT font;
 	char uimsg[MAX_UIMSG];
 
 	switch (msg) {
@@ -1776,7 +1784,7 @@
 		}
 
 		init_hosts_dlg(pvar, dlg);
-
+#if 0
 		font = (HFONT)SendMessage(dlg, WM_GETFONT, 0, 0);
 		GetObject(font, sizeof(LOGFONT), &logfont);
 		if (UTIL_get_lang_font("DLG_TAHOMA_FONT", dlg, &logfont, &DlgHostsAddFont, pvar)) {
@@ -1796,10 +1804,12 @@
 		else {
 			DlgHostsAddFont = NULL;
 		}
-
+#endif
 		// 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:
@@ -1825,11 +1835,11 @@
 			pvar->hosts_state.hosts_dialog = NULL;
 
 			EndDialog(dlg, 1);
-
+#if 0
 			if (DlgHostsAddFont != NULL) {
 				DeleteObject(DlgHostsAddFont);
 			}
-
+#endif
 			return TRUE;
 
 		case IDCANCEL:			/* kill the connection */
@@ -1837,11 +1847,11 @@
 			pvar->hosts_state.hosts_dialog = NULL;
 			notify_closed_connection(pvar, "authentication cancelled");
 			EndDialog(dlg, 0);
-
+#if 0
 			if (DlgHostsAddFont != NULL) {
 				DeleteObject(DlgHostsAddFont);
 			}
-
+#endif
 			return TRUE;
 
 		case IDC_FP_HASH_ALG_MD5:
@@ -1868,8 +1878,8 @@
                                             LPARAM lParam)
 {
 	PTInstVar pvar;
-	LOGFONT logfont;
-	HFONT font;
+//	LOGFONT logfont;
+//	HFONT font;
 	char uimsg[MAX_UIMSG];
 
 	switch (msg) {
@@ -1942,7 +1952,7 @@
 		}
 
 		init_hosts_dlg(pvar, dlg);
-
+#if 0
 		font = (HFONT)SendMessage(dlg, WM_GETFONT, 0, 0);
 		GetObject(font, sizeof(LOGFONT), &logfont);
 		if (UTIL_get_lang_font("DLG_TAHOMA_FONT", dlg, &logfont, &DlgHostsReplaceFont, pvar)) {
@@ -1961,7 +1971,8 @@
 		else {
 			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 */
 
@@ -1989,11 +2000,11 @@
 			pvar->hosts_state.hosts_dialog = NULL;
 
 			EndDialog(dlg, 1);
-
+#if 0
 			if (DlgHostsReplaceFont != NULL) {
 				DeleteObject(DlgHostsReplaceFont);
 			}
-
+#endif
 			return TRUE;
 
 		case IDCANCEL:			/* kill the connection */
@@ -2001,11 +2012,11 @@
 			pvar->hosts_state.hosts_dialog = NULL;
 			notify_closed_connection(pvar, "authentication cancelled");
 			EndDialog(dlg, 0);
-
+#if 0
 			if (DlgHostsReplaceFont != NULL) {
 				DeleteObject(DlgHostsReplaceFont);
 			}
-
+#endif
 			return TRUE;
 
 		case IDC_FP_HASH_ALG_MD5:
@@ -2032,8 +2043,8 @@
                                          LPARAM lParam)
 {
 	PTInstVar pvar;
-	LOGFONT logfont;
-	HFONT font;
+//	LOGFONT logfont;
+//	HFONT font;
 	char uimsg[MAX_UIMSG];
 
 	switch (msg) {
@@ -2106,7 +2117,7 @@
 		}
 
 		init_hosts_dlg(pvar, dlg);
-
+#if 0
 		font = (HFONT)SendMessage(dlg, WM_GETFONT, 0, 0);
 		GetObject(font, sizeof(LOGFONT), &logfont);
 		if (UTIL_get_lang_font("DLG_TAHOMA_FONT", dlg, &logfont, &DlgHostsAddFont, pvar)) {
@@ -2126,7 +2137,8 @@
 		else {
 			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);
 
@@ -2155,11 +2167,11 @@
 			pvar->hosts_state.hosts_dialog = NULL;
 
 			EndDialog(dlg, 1);
-
+#if 0
 			if (DlgHostsAddFont != NULL) {
 				DeleteObject(DlgHostsAddFont);
 			}
-
+#endif
 			return TRUE;
 
 		case IDCANCEL:			/* kill the connection */
@@ -2167,11 +2179,11 @@
 			pvar->hosts_state.hosts_dialog = NULL;
 			notify_closed_connection(pvar, "authentication cancelled");
 			EndDialog(dlg, 0);
-
+#if 0
 			if (DlgHostsAddFont != NULL) {
 				DeleteObject(DlgHostsAddFont);
 			}
-
+#endif
 			return TRUE;
 
 		case IDC_FP_HASH_ALG_MD5:

Modified: branches/ssh_auth_dialog/ttssh2/ttxssh/key.c
===================================================================
--- branches/ssh_auth_dialog/ttssh2/ttxssh/key.c	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/ttssh2/ttxssh/key.c	2019-04-24 14:08:16 UTC (rev 7613)
@@ -27,6 +27,7 @@
  */
 #include "key.h"
 #include "resource.h"
+#include "dlglib.h"
 
 #include <openssl/rsa.h>
 #include <openssl/dsa.h>
@@ -33,6 +34,13 @@
 #include <openssl/ecdsa.h>
 #include <openssl/buffer.h>
 
+#undef DialogBoxParam
+#define DialogBoxParam(p1,p2,p3,p4,p5) \
+	TTDialogBoxParam(p1,p2,p3,p4,p5)
+#undef EndDialog
+#define EndDialog(p1,p2) \
+	TTEndDialog(p1, p2)
+
 #define INTBLOB_LEN 20
 #define SIGBLOB_LEN (2*INTBLOB_LEN)
 
@@ -592,7 +600,7 @@
 	return TRUE;
 }
 
-char* key_fingerprint_raw(Key *k, enum digest_algorithm dgst_alg, int *dgst_raw_length)
+char* key_fingerprint_raw(Key *k, digest_algorithm dgst_alg, int *dgst_raw_length)
 {
 	const EVP_MD *md = NULL;
 	EVP_MD_CTX ctx;
@@ -879,7 +887,7 @@
 //
 // fingerprint\x81i\x8Ew\x96\xE4\x81F\x83z\x83X\x83g\x8C\xF6\x8AJ\x8C\xAE\x82̃n\x83b\x83V\x83\x85\x81j\x82𐶐\xAC\x82\xB7\x82\xE9
 //
-char *key_fingerprint(Key *key, enum fp_rep dgst_rep, enum digest_algorithm dgst_alg)
+char *key_fingerprint(Key *key, enum fp_rep dgst_rep, digest_algorithm dgst_alg)
 {
 	char *retval = NULL, *alg;
 	unsigned char *dgst_raw;
@@ -2188,10 +2196,10 @@
 
 static BOOL CALLBACK hosts_updatekey_dlg_proc(HWND dlg, UINT msg, WPARAM wParam, LPARAM lParam)
 {
-	static HFONT DlgHostsAddFont;
+//	static HFONT DlgHostsAddFont;
 	PTInstVar pvar;
-	LOGFONT logfont;
-	HFONT font;
+//	LOGFONT logfont;
+//	HFONT font;
 	char buf[1024];
 	char *host;
 	struct hostkeys_update_ctx *ctx;
@@ -2239,7 +2247,7 @@
 		GetDlgItemText(dlg, IDCANCEL, uimsg, sizeof(uimsg));
 		UTIL_get_lang_msg("BTN_NO", pvar, uimsg);
 		SetDlgItemText(dlg, IDCANCEL, pvar->ts->UIMsg);
-
+#if 0
 		font = (HFONT)SendMessage(dlg, WM_GETFONT, 0, 0);
 		GetObject(font, sizeof(LOGFONT), &logfont);
 		if (UTIL_get_lang_font("DLG_TAHOMA_FONT", dlg, &logfont, &DlgHostsAddFont, pvar)) {
@@ -2257,7 +2265,8 @@
 		else {
 			DlgHostsAddFont = NULL;
 		}
-
+#endif
+		CenterWindow(dlg, GetParent(dlg));
 		return TRUE;			/* because we do not set the focus */
 
 	case WM_COMMAND:
@@ -2267,20 +2276,20 @@
 		case IDOK:
 
 			EndDialog(dlg, 1);
-
+#if 0
 			if (DlgHostsAddFont != NULL) {
 				DeleteObject(DlgHostsAddFont);
 			}
-
+#endif
 			return TRUE;
 
 		case IDCANCEL:			/* kill the connection */
 			EndDialog(dlg, 0);
-
+#if 0
 			if (DlgHostsAddFont != NULL) {
 				DeleteObject(DlgHostsAddFont);
 			}
-
+#endif
 			return TRUE;
 
 		case IDC_FP_HASH_ALG_MD5:

Modified: branches/ssh_auth_dialog/ttssh2/ttxssh/key.h
===================================================================
--- branches/ssh_auth_dialog/ttssh2/ttxssh/key.h	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/ttssh2/ttxssh/key.h	2019-04-24 14:08:16 UTC (rev 7613)
@@ -43,12 +43,12 @@
 unsigned char *duplicate_ED25519_PK(unsigned char *src);
 BOOL key_copy(Key *dest, Key *src);
 
-char *key_fingerprint_raw(Key *k, enum digest_algorithm dgst_alg, int *dgst_raw_length);
-char *key_fingerprint(Key *key, enum fp_rep dgst_rep, enum fp_type dgst_type);
+char *key_fingerprint_raw(Key *k, digest_algorithm dgst_alg, int *dgst_raw_length);
+char *key_fingerprint(Key *key, enum fp_rep dgst_rep, digest_algorithm dgst_alg);
 
 const char *ssh_key_type(ssh_keytype type);
 char *get_sshname_from_key(Key *key);
-enum hostkey_type get_keytype_from_name(char *name);
+ssh_keytype get_keytype_from_name(char *name);
 char *curve_keytype_to_name(ssh_keytype type);
 ssh_keytype key_curve_name_to_keytype(char *name);
 

Modified: branches/ssh_auth_dialog/ttssh2/ttxssh/keyfiles.c
===================================================================
--- branches/ssh_auth_dialog/ttssh2/ttxssh/keyfiles.c	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/ttssh2/ttxssh/keyfiles.c	2019-04-24 14:08:16 UTC (rev 7613)
@@ -388,7 +388,7 @@
 		len = fread(buf, 1, sizeof(buf), fp);
 		buffer_append(blob, buf, len);
 		if (buffer_len(blob) > MAX_KEY_FILE_SIZE) {
-			logprintf(LOG_LEVEL_WARNING, __FUNCTION__ ": key file too large.");
+			logprintf(LOG_LEVEL_WARNING, "%s: key file too large.", __FUNCTION__);
 			goto error;
 		}
 		if (len < sizeof(buf))
@@ -401,7 +401,7 @@
 	cp = buffer_ptr(blob);
 	len = buffer_len(blob);
 	if (len < m1len || memcmp(cp, MARK_BEGIN, m1len)) {
-		logprintf(LOG_LEVEL_VERBOSE, __FUNCTION__ ": missing begin marker");
+		logprintf(LOG_LEVEL_VERBOSE, "%s: missing begin marker", __FUNCTION__);
 		goto error;
 	}
 	cp += m1len;
@@ -420,7 +420,7 @@
 		}
 	}
 	if (!len) {
-		logprintf(LOG_LEVEL_VERBOSE, __FUNCTION__ ": no end marker");
+		logprintf(LOG_LEVEL_VERBOSE, "%s: no end marker", __FUNCTION__);
 		goto error;
 	}
 
@@ -427,15 +427,15 @@
 	// \x83t\x83@\x83C\x83\x8B\x82̃X\x83L\x83\x83\x83\x93\x82\xAA\x8FI\x82\xED\x82\xC1\x82\xBD\x82̂ŁAbase64 decode\x82\xB7\x82\xE9\x81B
 	len = buffer_len(encoded);
 	if ((cp = buffer_append_space(copy_consumed, len)) == NULL) {
-		logprintf(LOG_LEVEL_ERROR, __FUNCTION__ ": buffer_append_space");
+		logprintf(LOG_LEVEL_ERROR, "%s: buffer_append_space", __FUNCTION__);
 		goto error;
 	}
 	if ((dlen = b64decode(cp, len, buffer_ptr(encoded))) < 0) {
-		logprintf(LOG_LEVEL_ERROR, __FUNCTION__ ": base64 decode failed");
+		logprintf(LOG_LEVEL_ERROR, "%s: base64 decode failed", __FUNCTION__);
 		goto error;
 	}
 	if ((unsigned int)dlen > len) {
-		logprintf(LOG_LEVEL_ERROR, __FUNCTION__ ": crazy base64 length %d > %u", dlen, len);
+		logprintf(LOG_LEVEL_ERROR, "%s: crazy base64 length %d > %u", __FUNCTION__, dlen, len);
 		goto error;
 	}
 
@@ -442,7 +442,7 @@
 	buffer_consume_end(copy_consumed, len - dlen);
 	if (buffer_remain_len(copy_consumed) < sizeof(AUTH_MAGIC) ||
 	    memcmp(buffer_tail_ptr(copy_consumed), AUTH_MAGIC, sizeof(AUTH_MAGIC))) {
-		logprintf(LOG_LEVEL_ERROR, __FUNCTION__ ": bad magic");
+		logprintf(LOG_LEVEL_ERROR, "%s: bad magic", __FUNCTION__);
 		goto error;
 	}
 	buffer_consume(copy_consumed, sizeof(AUTH_MAGIC));
@@ -467,11 +467,11 @@
 	kdfname = buffer_get_string_msg(copy_consumed, NULL);
 	if (kdfname == NULL ||
 	    (!strcmp(kdfname, "none") && !strcmp(kdfname, KDFNAME))) {
-		logprintf(LOG_LEVEL_ERROR, __FUNCTION__ ": unknown kdf name");
+		logprintf(LOG_LEVEL_ERROR, "%s: unknown kdf name", __FUNCTION__ );
 		goto error;
 	}
 	if (!strcmp(kdfname, "none") && strcmp(ciphername, "none") != 0) {
-		logprintf(LOG_LEVEL_ERROR, __FUNCTION__ "%s: cipher %s requires kdf", ciphername);
+		logprintf(LOG_LEVEL_ERROR, "%s: cipher %s requires kdf", __FUNCTION__, ciphername);
 		goto error;
 	}
 
@@ -478,12 +478,12 @@
 	/* kdf options */
 	kdfp = buffer_get_string_msg(copy_consumed, &klen);
 	if (kdfp == NULL) {
-		logprintf(LOG_LEVEL_ERROR, __FUNCTION__ ": kdf options not set");
+		logprintf(LOG_LEVEL_ERROR, "%s: kdf options not set", __FUNCTION__);
 		goto error;
 	}
 	if (klen > 0) {
 		if ((cp = buffer_append_space(kdf, klen)) == NULL) {
-			logprintf(LOG_LEVEL_ERROR, __FUNCTION__ ": kdf alloc failed");
+			logprintf(LOG_LEVEL_ERROR, "%s: kdf alloc failed", __FUNCTION__);
 			goto error;
 		}
 		memcpy(cp, kdfp, klen);
@@ -491,11 +491,11 @@
 
 	/* number of keys */
 	if (buffer_get_int_ret(&nkeys, copy_consumed) < 0) {
-		logprintf(LOG_LEVEL_ERROR, __FUNCTION__ ": key counter missing");
+		logprintf(LOG_LEVEL_ERROR, "%s: key counter missing", __FUNCTION__);
 		goto error;
 	}
 	if (nkeys != 1) {
-		logprintf(LOG_LEVEL_ERROR, __FUNCTION__ ": only one key supported");
+		logprintf(LOG_LEVEL_ERROR, "%s: only one key supported", __FUNCTION__);
 		goto error;
 	}
 
@@ -502,7 +502,7 @@
 	/* pubkey */
 	cp = buffer_get_string_msg(copy_consumed, &len);
 	if (cp == NULL) {
-		logprintf(LOG_LEVEL_ERROR, __FUNCTION__ ": pubkey not found");
+		logprintf(LOG_LEVEL_ERROR, "%s: pubkey not found", __FUNCTION__);
 		goto error;
 	}
 	free(cp); /* XXX check pubkey against decrypted private key */
@@ -512,11 +512,11 @@
 	blocksize = get_cipher_block_size(cipher);
 	authlen = 0;  // TODO: \x82Ƃ肠\x82\xA6\x82\xB8\x8CŒ艻
 	if (len < blocksize) {
-		logprintf(LOG_LEVEL_ERROR, __FUNCTION__ ": encrypted data too small");
+		logprintf(LOG_LEVEL_ERROR, "%s: encrypted data too small", __FUNCTION__);
 		goto error;
 	}
 	if (len % blocksize) {
-		logprintf(LOG_LEVEL_ERROR, __FUNCTION__ ": length not multiple of blocksize");
+		logprintf(LOG_LEVEL_ERROR, "%s: length not multiple of blocksize", __FUNCTION__);
 		goto error;
 	}
 
@@ -527,7 +527,7 @@
 	if (!strcmp(kdfname, KDFNAME)) {
 		salt = buffer_get_string_msg(kdf, &slen);
 		if (salt == NULL) {
-			logprintf(LOG_LEVEL_ERROR, __FUNCTION__ ": salt not set");
+			logprintf(LOG_LEVEL_ERROR, "%s: salt not set", __FUNCTION__);
 			goto error;
 		}
 		rounds = buffer_get_int(kdf);
@@ -534,7 +534,7 @@
 		// TODO: error check
 		if (bcrypt_pbkdf(passphrase, strlen(passphrase), salt, slen,
 		    key, keylen + ivlen, rounds) < 0) {
-			logprintf(LOG_LEVEL_ERROR, __FUNCTION__ ": bcrypt_pbkdf failed");
+			logprintf(LOG_LEVEL_ERROR, "%s: bcrypt_pbkdf failed", __FUNCTION__);
 			goto error;
 		}
 	}
@@ -551,7 +551,7 @@
 	buffer_consume(copy_consumed, len);
 
 	if (buffer_remain_len(copy_consumed) != 0) {
-		logprintf(LOG_LEVEL_ERROR, __FUNCTION__ ": key blob has trailing data (len = %u)",
+		logprintf(LOG_LEVEL_ERROR, "%s: key blob has trailing data (len = %u)", __FUNCTION__,
 			buffer_remain_len(copy_consumed));
 		goto error;
 	}
@@ -559,11 +559,11 @@
 	/* check bytes */
 	if (buffer_get_int_ret(&check1, b) < 0 ||
 	    buffer_get_int_ret(&check2, b) < 0) {
-		logprintf(LOG_LEVEL_ERROR, __FUNCTION__ ": check bytes missing");
+		logprintf(LOG_LEVEL_ERROR, "%s: check bytes missing", __FUNCTION__);
 		goto error;
 	}
 	if (check1 != check2) {
-		logprintf(LOG_LEVEL_VERBOSE, __FUNCTION__ ": decrypt failed: 0x%08x != 0x%08x",
+		logprintf(LOG_LEVEL_VERBOSE, "%s: decrypt failed: 0x%08x != 0x%08x", __FUNCTION__,
 			check1, check2);
 		goto error;
 	}
@@ -579,7 +579,7 @@
 	while (buffer_remain_len(b)) {
 		if (buffer_get_char_ret(&pad, b) == -1 ||
 		    pad != (++i & 0xff)) {
-			logprintf(LOG_LEVEL_ERROR, __FUNCTION__ ": bad padding");
+			logprintf(LOG_LEVEL_ERROR, "%s: bad padding", __FUNCTION__);
 			key_free(keyfmt);
 			keyfmt = NULL;
 			goto error;

Modified: branches/ssh_auth_dialog/ttssh2/ttxssh/sftp.c
===================================================================
--- branches/ssh_auth_dialog/ttssh2/ttxssh/sftp.c	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/ttssh2/ttxssh/sftp.c	2019-04-24 14:08:16 UTC (rev 7613)
@@ -1076,6 +1076,8 @@
 			hEditProc = (WNDPROC)GetWindowLong(hEdit, GWL_WNDPROC);
 			SetWindowLong(hEdit, GWL_WNDPROC, (LONG)EditProc);
 
+			CenterWindow(hDlgWnd, GetParent(hDlgWnd));
+
 			return TRUE;
 
 		case WM_COMMAND:

Modified: branches/ssh_auth_dialog/ttssh2/ttxssh/ssh.c
===================================================================
--- branches/ssh_auth_dialog/ttssh2/ttxssh/ssh.c	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/ttssh2/ttxssh/ssh.c	2019-04-24 14:08:16 UTC (rev 7613)
@@ -54,6 +54,7 @@
 #include "fwd.h"
 #include "sftp.h"
 #include "kex.h"
+#include "dlglib.h"
 
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -83,6 +84,10 @@
 //
 #define NonNull(msg) ((msg)?(msg):"(null)")
 
+#if defined(__MINGW32__)
+#define __FUNCTION__
+#endif
+
 typedef enum {
 	GetPayloadError = 0,
 	GetPayloadOK = 1,
@@ -181,7 +186,7 @@
 // channel function
 //
 static Channel_t *ssh2_channel_new(unsigned int window, unsigned int maxpack,
-                                   enum confirm_type type, int local_num)
+                                   enum channel_type type, int local_num)
 {
 	int i, found;
 	Channel_t *c;
@@ -3808,7 +3813,7 @@
 		auth_data_ptr = outmsg + 8 + protocol_len;
 		for (i = 0; i < auth_data_len; i++) {
 			_snprintf_s(auth_data_ptr + i * 2,
-			            outmsg_len - (auth_data_ptr - outmsg) - i * 2,
+			            outmsg_len - ((UINT_PTR)auth_data_ptr - (UINT_PTR)outmsg) - i * 2,
 			            _TRUNCATE, "%.2x", auth_data[i]);
 		}
 		set_uint32(outmsg + 8 + protocol_len + data_len, screen_num);
@@ -5833,7 +5838,7 @@
 	// known_hosts\x91Ή\x9E (2006.3.20 yutaka)
 	if (hostkey->type != pvar->hostkey_type) {  // \x83z\x83X\x83g\x83L\x81[\x82̎\xED\x95ʔ\xE4\x8Ar
 		_snprintf_s(emsg_tmp, sizeof(emsg_tmp), _TRUNCATE,
-		            "%s: type mismatch for decoded server_host_key_blob (kex:%s blob:%s)", __FUNCTION__,
+		            "%s: type mismatch for decoded server_host_key_blob (kex:%s blob:%s)", /*__FUNCTION__*/"handle_SSH2_dh_kex_reply",
 		            get_ssh_keytype_name(pvar->hostkey_type), get_ssh_keytype_name(hostkey->type));
 		emsg = emsg_tmp;
 		goto error;
@@ -5976,7 +5981,7 @@
 	// known_hosts\x91Ή\x9E (2006.3.20 yutaka)
 	if (hostkey->type != pvar->hostkey_type) {  // \x83z\x83X\x83g\x83L\x81[\x82̎\xED\x95ʔ\xE4\x8Ar
 		_snprintf_s(emsg_tmp, sizeof(emsg_tmp), _TRUNCATE,
-		            "%s: type mismatch for decoded server_host_key_blob (kex:%s blob:%s)", __FUNCTION__,
+		            "%s: type mismatch for decoded server_host_key_blob (kex:%s blob:%s)", /*__FUNCTION__*/"handle_SSH2_dh_gex_reply",
 		            get_ssh_keytype_name(pvar->hostkey_type), get_ssh_keytype_name(hostkey->type));
 		emsg = emsg_tmp;
 		goto error;
@@ -6125,7 +6130,7 @@
 	// known_hosts\x91Ή\x9E (2006.3.20 yutaka)
 	if (hostkey->type != pvar->hostkey_type) {  // \x83z\x83X\x83g\x83L\x81[\x82̎\xED\x95ʔ\xE4\x8Ar
 		_snprintf_s(emsg_tmp, sizeof(emsg_tmp), _TRUNCATE,
-		            "%s: type mismatch for decoded server_host_key_blob (kex:%s blob:%s)", __FUNCTION__,
+		            "%s: type mismatch for decoded server_host_key_blob (kex:%s blob:%s)", /*__FUNCTION__*/"handle_SSH2_ecdh_kex_reply",
 		            get_ssh_keytype_name(pvar->hostkey_type), get_ssh_keytype_name(hostkey->type));
 		emsg = emsg_tmp;
 		goto error;
@@ -7346,9 +7351,9 @@
 	char new_passwd[PASSWD_MAXLEN];
 	char retype_passwd[PASSWD_MAXLEN];
 	static struct change_password *cp;
-	LOGFONT logfont;
-	HFONT font;
-	static HFONT DlgChgPassFont;
+//	LOGFONT logfont;
+//	HFONT font;
+//	static HFONT DlgChgPassFont;
 	char uimsg[MAX_UIMSG];
 	static PTInstVar pvar;
 
@@ -7358,6 +7363,7 @@
 		cp = (struct change_password *)lParam;
 		pvar = cp->pvar;
 
+#if 0
 		font = (HFONT)SendMessage(dlg, WM_GETFONT, 0, 0);
 		GetObject(font, sizeof(LOGFONT), &logfont);
 
@@ -7367,6 +7373,7 @@
 		else {
 			DlgChgPassFont = NULL;
 		}
+#endif
 
 		GetWindowText(dlg, uimsg, sizeof(uimsg));
 		UTIL_get_lang_msg("DLG_PASSCHG_TITLE", pvar, uimsg);
@@ -7390,6 +7397,8 @@
 
 		SetFocus(GetDlgItem(dlg, IDC_OLD_PASSWD));
 
+		CenterWindow(dlg, GetParent(dlg));
+
 		return FALSE;
 
 	case WM_COMMAND:
@@ -7416,12 +7425,12 @@
 			strncpy_s(cp->new_passwd, sizeof(cp->new_passwd), new_passwd, _TRUNCATE);
 
 			EndDialog(dlg, 1); // dialog close
-
+#if 0
 			if (DlgChgPassFont != NULL) {
 				DeleteObject(DlgChgPassFont);
 				DlgChgPassFont = NULL;
 			}
-
+#endif
 			return TRUE;
 
 		case IDCANCEL:
@@ -7428,12 +7437,12 @@
 			// \x90ڑ\xB1\x82\xF0\x90؂\xE9
                         notify_closed_connection(pvar, "authentication cancelled");
 			EndDialog(dlg, 0); // dialog close
-
+#if 0
 			if (DlgChgPassFont != NULL) {
 				DeleteObject(DlgChgPassFont);
 				DlgChgPassFont = NULL;
 			}
-
+#endif
 			return TRUE;
 		}
 	}
@@ -8113,6 +8122,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
@@ -8192,6 +8202,8 @@
 		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;
 	HProg = GetDlgItem(HDlg, id_Progress);
@@ -8204,6 +8216,7 @@
 
 	return;
 }
+#endif
 
 static unsigned __stdcall ssh_scp_thread(void *p)
 {

Modified: branches/ssh_auth_dialog/ttssh2/ttxssh/ttxssh.c
===================================================================
--- branches/ssh_auth_dialog/ttssh2/ttxssh/ttxssh.c	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/ttssh2/ttxssh/ttxssh.c	2019-04-24 14:08:16 UTC (rev 7613)
@@ -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>
@@ -57,7 +59,7 @@
 #include <winsock2.h>
 static char *ProtocolFamilyList[] = { "UNSPEC", "IPv6", "IPv4", NULL };
 
-#include <Lmcons.h>
+#include <lmcons.h>
 
 // include OpenSSL header file
 #include <openssl/evp.h>
@@ -75,13 +77,22 @@
 #include "buffer.h"
 #include "cipher.h"
 #include "key.h"
+#include "dlglib.h"
 
 #include "sftp.h"
 
 #include "compat_w95.h"
+#include "compat_win.h"
 
 #include "libputty.h"
 
+#undef DialogBoxParam
+#define DialogBoxParam(p1,p2,p3,p4,p5) \
+	TTDialogBoxParam(p1,p2,p3,p4,p5)
+#undef EndDialog
+#define EndDialog(p1,p2) \
+	TTEndDialog(p1, p2)
+
 #define MATCH_STR(s, o) strncmp((s), (o), NUM_ELEM(o) - 1)
 #define MATCH_STR_I(s, o) _strnicmp((s), (o), NUM_ELEM(o) - 1)
 
@@ -94,11 +105,11 @@
 static HICON SecureNotifyIcon = NULL;
 static HICON OldNotifyIcon = NULL;
 
-static HFONT DlgHostFont;
-static HFONT DlgAboutFont;
+//static HFONT DlgHostFont;
+//static HFONT DlgAboutFont;
 static HFONT DlgAboutTextFont;
-static HFONT DlgSetupFont;
-static HFONT DlgKeygenFont;
+//static HFONT DlgSetupFont;
+//static HFONT DlgKeygenFont;
 
 static TInstVar *pvar;
 
@@ -1247,8 +1258,8 @@
 	static char *ComPortDesc[MAXCOMPORT];
 	int comports;
 	BOOL Ok;
-	LOGFONT logfont;
-	HFONT font;
+//	LOGFONT logfont;
+//	HFONT font;
 	char uimsg[MAX_UIMSG];
 	static HWND hwndHostname     = NULL; // HOSTNAME dropdown
 	static HWND hwndHostnameEdit = NULL; // Edit control on HOSTNAME dropdown
@@ -1452,6 +1463,7 @@
 			SetFocus(hwnd);
 		}
 
+#if 0
 		font = (HFONT)SendMessage(dlg, WM_GETFONT, 0, 0);
 		GetObject(font, sizeof(LOGFONT), &logfont);
 		if (UTIL_get_lang_font("DLG_SYSTEM_FONT", dlg, &logfont, &DlgHostFont, pvar)) {
@@ -1479,7 +1491,10 @@
 		else {
 			DlgHostFont = NULL;
 		}
+#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)
@@ -1557,21 +1572,21 @@
 			}
 			SetWindowLong(hwndHostnameEdit, GWL_WNDPROC, (LONG)OrigHostnameEditProc);
 			EndDialog(dlg, 1);
-
+#if 0
 			if (DlgHostFont != NULL) {
 				DeleteObject(DlgHostFont);
 			}
-
+#endif
 			return TRUE;
 
 		case IDCANCEL:
 			SetWindowLong(hwndHostnameEdit, GWL_WNDPROC, (LONG)OrigHostnameEditProc);
 			EndDialog(dlg, 0);
-
+#if 0
 			if (DlgHostFont != NULL) {
 				DeleteObject(DlgHostFont);
 			}
-
+#endif
 			return TRUE;
 
 		case IDC_HOSTTCPIP:
@@ -1655,10 +1670,17 @@
 	return FALSE;
 }
 
+static void UTIL_SetDialogFont()
+{
+	SetDialogFont(pvar->ts->SetupFName, pvar->ts->UILanguageFile, "TTSSH", "DLG_TAHOMA_FONT");
+}
+
 static BOOL PASCAL TTXGetHostName(HWND parent, PGetHNRec rec)
 {
+	SetDialogFont(pvar->ts->SetupFName,
+				  pvar->ts->UILanguageFile, "TTSSH", "DLG_SYSTEM_FONT");
 	return (BOOL) DialogBoxParam(hInst, MAKEINTRESOURCE(IDD_HOSTDLG),
-	                             parent, TTXHostDlg, (LONG) rec);
+	                             parent, TTXHostDlg, (LPARAM)rec);
 }
 
 static void PASCAL TTXGetUIHooks(TTXUIHooks *hooks)
@@ -2404,11 +2426,13 @@
 	SendMessage(GetDlgItem(dlg, IDC_PUTTY_VERSION), WM_SETTEXT, 0, (LPARAM)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
@@ -2455,11 +2479,12 @@
 static BOOL CALLBACK TTXAboutDlg(HWND dlg, UINT msg, WPARAM wParam,
                                  LPARAM lParam)
 {
-	LOGFONT logfont;
-	HFONT font;
+//	LOGFONTA logfont;
+//	HFONT font;
 
 	switch (msg) {
 	case WM_INITDIALOG:
+#if 0
 		font = (HFONT)SendMessage(dlg, WM_GETFONT, 0, 0);
 		GetObject(font, sizeof(LOGFONT), &logfont);
 		if (UTIL_get_lang_font("DLG_TAHOMA_FONT", dlg, &logfont, &DlgAboutFont, pvar)) {
@@ -2480,26 +2505,24 @@
 		else {
 			DlgAboutFont = NULL;
 		}
+#endif
 
 		// 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 (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 = CreateFontIndirect(&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
 		}
+		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
 		{
@@ -2524,6 +2547,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:
@@ -2530,9 +2555,11 @@
 		switch (LOWORD(wParam)) {
 		case IDOK:
 			EndDialog(dlg, 1);
+#if 0
 			if (DlgAboutFont != NULL) {
 				DeleteObject(DlgAboutFont);
 			}
+#endif
 			if (DlgAboutTextFont != NULL) {
 				DeleteObject(DlgAboutTextFont);
 			}
@@ -2540,9 +2567,11 @@
 		case IDCANCEL:			/* there isn't a cancel button, but other Windows
 								   UI things can send this message */
 			EndDialog(dlg, 0);
+#if 0
 			if (DlgAboutFont != NULL) {
 				DeleteObject(DlgAboutFont);
 			}
+#endif
 			if (DlgAboutTextFont != NULL) {
 				DeleteObject(DlgAboutTextFont);
 			}
@@ -3295,14 +3324,14 @@
 static BOOL CALLBACK TTXSetupDlg(HWND dlg, UINT msg, WPARAM wParam,
                                  LPARAM lParam)
 {
-	LOGFONT logfont;
-	HFONT font;
+//	LOGFONT logfont;
+//	HFONT font;
 
 	switch (msg) {
 	case WM_INITDIALOG:
 		SetWindowLong(dlg, DWL_USER, lParam);
 		init_setup_dlg((PTInstVar) lParam, dlg);
-
+#if 0
 		font = (HFONT)SendMessage(dlg, WM_GETFONT, 0, 0);
 		GetObject(font, sizeof(LOGFONT), &logfont);
 		if (UTIL_get_lang_font("DLG_TAHOMA_FONT", dlg, &logfont, &DlgSetupFont, pvar)) {
@@ -3359,7 +3388,10 @@
 		else {
 			DlgSetupFont = NULL;
 		}
+#endif
 
+		CenterWindow(dlg, GetParent(dlg));
+
 		return TRUE;
 	case WM_COMMAND:
 		switch (LOWORD(wParam)) {
@@ -3366,16 +3398,20 @@
 		case IDOK:
 			complete_setup_dlg((PTInstVar) GetWindowLong(dlg, DWL_USER), dlg);
 			EndDialog(dlg, 1);
+#if 0
 			if (DlgSetupFont != NULL) {
 				DeleteObject(DlgSetupFont);
 			}
+#endif
 			return TRUE;
 		case IDCANCEL:			/* there isn't a cancel button, but other Windows
 								   UI things can send this message */
 			EndDialog(dlg, 0);
+#if 0
 			if (DlgSetupFont != NULL) {
 				DeleteObject(DlgSetupFont);
 			}
+#endif
 			return TRUE;
 		// Cipher order
 		case IDC_SSHMOVECIPHERUP:
@@ -3918,6 +3954,7 @@
 #ifdef SFTP_DEBUG
 		ShowWindow(GetDlgItem(dlg, IDC_SFTP_TEST), SW_SHOW);
 #endif
+		CenterWindow(dlg, GetParent(dlg));
 
 		return TRUE;
 
@@ -4127,15 +4164,6 @@
 	return;
 }
 
-static void init_password_control(HWND dlg, int item)
-{
-	HWND passwordControl = GetDlgItem(dlg, item);
-
-	SetWindowLong(passwordControl, GWL_USERDATA,
-	              SetWindowLong(passwordControl, GWL_WNDPROC,
-	                            (LONG) 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, char *filename, char *comment, HWND dlg, PTInstVar pvar, int rounds)
@@ -4294,8 +4322,8 @@
 	static ssh_keytype key_type;
 	static int saved_key_bits;
 	char uimsg[MAX_UIMSG];
-	LOGFONT logfont;
-	HFONT font;
+//	LOGFONT logfont;
+//	HFONT font;
 
 	switch (msg) {
 	case WM_INITDIALOG:
@@ -4336,7 +4364,7 @@
 		GetDlgItemText(dlg, IDC_BCRYPT_KDF_ROUNDS_LABEL, uimsg, sizeof(uimsg));
 		UTIL_get_lang_msg("DLG_KEYGEN_BCRYPT_ROUNDS", pvar, uimsg);
 		SetDlgItemText(dlg, IDC_BCRYPT_KDF_ROUNDS_LABEL, pvar->ts->UIMsg);
-
+#if 0
 		font = (HFONT)SendMessage(dlg, WM_GETFONT, 0, 0);
 		GetObject(font, sizeof(LOGFONT), &logfont);
 		if (UTIL_get_lang_font("DLG_TAHOMA_FONT", dlg, &logfont, &DlgKeygenFont, pvar)) {
@@ -4368,9 +4396,10 @@
 		else {
 			DlgHostFont = NULL;
 		}
+#endif
 
-		init_password_control(dlg, IDC_KEY_EDIT);
-		init_password_control(dlg, IDC_CONFIRM_EDIT);
+		init_password_control(pvar, dlg, IDC_KEY_EDIT);
+		init_password_control(pvar, dlg, IDC_CONFIRM_EDIT);
 
 		// default key type
 		SendMessage(GetDlgItem(dlg, IDC_RSA_TYPE), BM_SETCHECK, BST_CHECKED, 0);
@@ -4399,6 +4428,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;
 
@@ -4525,9 +4556,11 @@
 			// don't forget to free SSH resource!
 			free_ssh_key();
 			EndDialog(dlg, 0); // dialog close
+#if 0
 			if (DlgKeygenFont != NULL) {
 				DeleteObject(DlgKeygenFont);
 			}
+#endif
 			return TRUE;
 
 		// if radio button pressed...
@@ -5125,6 +5158,7 @@
 			return 0;  // SSH2\x82ŏ\x88\x97\x9D\x82\xB3\x82\xEA\x82Ȃ\xA9\x82\xC1\x82\xBD\x8Fꍇ\x82́A\x96{\x97\x88\x82̓\xAE\x8D\xEC\x82\xF0\x8Ds\x82\xA4\x82ׂ\xAD\x81A\x83[\x83\x8D\x82\xF0\x95Ԃ\xB7\x81B
 
 	case ID_SSHSCPMENU:
+		UTIL_SetDialogFont();
 		if (DialogBoxParam(hInst, MAKEINTRESOURCE(IDD_SSHSCP), hWin, TTXScpDialog,
 			(LPARAM) pvar) == -1) {
 			UTIL_get_lang_msg("MSG_CREATEWINDOW_SCP_ERROR", pvar,
@@ -5136,6 +5170,7 @@
 		return 1;
 
 	case ID_SSHKEYGENMENU:
+		UTIL_SetDialogFont();
 		if (DialogBoxParam(hInst, MAKEINTRESOURCE(IDD_SSHKEYGEN), hWin, TTXKeyGenerator,
 			(LPARAM) pvar) == -1) {
 			UTIL_get_lang_msg("MSG_CREATEWINDOW_KEYGEN_ERROR", pvar,
@@ -5147,6 +5182,7 @@
 		return 1;
 
 	case ID_ABOUTMENU:
+		UTIL_SetDialogFont();
 		if (DialogBoxParam(hInst, MAKEINTRESOURCE(IDD_ABOUTDIALOG),
 		                   hWin, TTXAboutDlg, (LPARAM) pvar) == -1) {
 			UTIL_get_lang_msg("MSG_CREATEWINDOW_ABOUT_ERROR", pvar,
@@ -5157,9 +5193,11 @@
 		}
 		return 1;
 	case ID_SSHAUTH:
+		UTIL_SetDialogFont();
 		AUTH_do_cred_dialog(pvar);
 		return 1;
 	case ID_SSHSETUPMENU:
+		UTIL_SetDialogFont();
 		if (DialogBoxParam(hInst, MAKEINTRESOURCE(IDD_SSHSETUP),
 		                   hWin, TTXSetupDlg, (LPARAM) pvar) == -1) {
 			UTIL_get_lang_msg("MSG_CREATEWINDOW_SETUP_ERROR", pvar,
@@ -5170,15 +5208,19 @@
 		}
 		return 1;
 	case ID_SSHAUTHSETUPMENU:
+		UTIL_SetDialogFont();
 		AUTH_do_default_cred_dialog(pvar);
 		return 1;
 	case ID_SSHFWDSETUPMENU:
+		UTIL_SetDialogFont();
 		FWDUI_do_forwarding_dialog(pvar);
 		return 1;
 	case ID_SSHUNKNOWNHOST:
+		UTIL_SetDialogFont();
 		HOSTS_do_unknown_host_dialog(hWin, pvar);
 		return 1;
 	case ID_SSHDIFFERENTKEY:
+		UTIL_SetDialogFont();
 		HOSTS_do_different_key_dialog(hWin, pvar);
 		return 1;
 	case ID_SSHASYNCMESSAGEBOX:

Deleted: branches/ssh_auth_dialog/ttssh2/ttxssh/ttxssh.dsp
===================================================================
--- branches/ssh_auth_dialog/ttssh2/ttxssh/ttxssh.dsp	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/ttssh2/ttxssh/ttxssh.dsp	2019-04-24 14:08:16 UTC (rev 7613)
@@ -1,155 +0,0 @@
-# Microsoft Developer Studio Project File - Name="ttxssh" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-
-CFG=ttxssh - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "ttxssh.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "ttxssh.mak" CFG="ttxssh - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "ttxssh - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "ttxssh - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "ttxssh - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MT /W3 /GX /Zi /O2 /Ob2 /I "..\Teraterm-2.3\source\common" /I "..\SSLeay-0.8.1\out" /I "..\Teraterm-2.3\source\teraterm" /I "..\zlib" /I "..\matcher" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FAcs /YX /FD /c
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386
-# ADD LINK32 wsock32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /base:"0x12500000" /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept
-# Begin Special Build Tool
-SOURCE="$(InputPath)"
-PostBuild_Cmds=copy     Release\ttxssh.dll "\Program Files\teraterm"
-# End Special Build Tool
-
-!ELSEIF  "$(CFG)" == "ttxssh - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /WX /Gm /GX /ZI /Od /I "..\Teraterm-2.3\source\common" /I "..\SSLeay-0.8.1\out" /I "..\Teraterm-2.3\source\teraterm" /I "..\zlib" /I "..\matcher" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_CRTDBG_MAP_ALLOC" /FR /YX /FD /c
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib /nologo /base:"0x12500000" /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept
-
-!ENDIF 
-
-# Begin Target
-
-# Name "ttxssh - Win32 Release"
-# Name "ttxssh - Win32 Debug"
-# Begin Source File
-
-SOURCE=.\auth.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\crypt.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\fwd.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\fwdui.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\hosts.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\keyfiles.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\matcher\matcher.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\pkt.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\ssh.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\ttsecure.ico
-# End Source File
-# Begin Source File
-
-SOURCE=.\ttxssh.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\ttxssh.rc
-# End Source File
-# Begin Source File
-
-SOURCE=.\util.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\x11util.c
-# End Source File
-# Begin Source File
-
-SOURCE="..\SSLeay-0.8.1\out\libeay32.lib"
-# End Source File
-# End Target
-# End Project

Modified: branches/ssh_auth_dialog/ttssh2/ttxssh/ttxssh.rc
===================================================================
--- branches/ssh_auth_dialog/ttssh2/ttxssh/ttxssh.rc	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/ttssh2/ttxssh/ttxssh.rc	2019-04-24 14:08:16 UTC (rev 7613)
@@ -7,7 +7,10 @@
 //
 // Generated from the TEXTINCLUDE 2 resource.
 //
-#include "afxres.h"
+#include <windows.h>
+#ifndef IDC_STATIC
+#define IDC_STATIC -1
+#endif
 
 /////////////////////////////////////////////////////////////////////////////
 #undef APSTUDIO_READONLY_SYMBOLS

Modified: branches/ssh_auth_dialog/ttssh2/ttxssh/ttxssh.v10.vcxproj
===================================================================
--- branches/ssh_auth_dialog/ttssh2/ttxssh/ttxssh.v10.vcxproj	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/ttssh2/ttxssh/ttxssh.v10.vcxproj	2019-04-24 14:08:16 UTC (rev 7613)
@@ -135,6 +135,11 @@
     </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\tipwin.cpp" />
+    <ClCompile Include="..\..\teraterm\common\ttlib.c" />
     <ClCompile Include="..\..\teraterm\teraterm\WSAAsyncGetAddrInfo.c" />
     <ClCompile Include="..\matcher\matcher.c" />
     <ClCompile Include="arc4random.c" />

Modified: branches/ssh_auth_dialog/ttssh2/ttxssh/ttxssh.v11.vcxproj
===================================================================
--- branches/ssh_auth_dialog/ttssh2/ttxssh/ttxssh.v11.vcxproj	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/ttssh2/ttxssh/ttxssh.v11.vcxproj	2019-04-24 14:08:16 UTC (rev 7613)
@@ -140,6 +140,11 @@
     </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\tipwin.cpp" />
+    <ClCompile Include="..\..\teraterm\common\ttlib.c" />
     <ClCompile Include="..\..\teraterm\teraterm\WSAAsyncGetAddrInfo.c" />
     <ClCompile Include="..\matcher\matcher.c" />
     <ClCompile Include="arc4random.c" />

Modified: branches/ssh_auth_dialog/ttssh2/ttxssh/ttxssh.v12.vcxproj
===================================================================
--- branches/ssh_auth_dialog/ttssh2/ttxssh/ttxssh.v12.vcxproj	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/ttssh2/ttxssh/ttxssh.v12.vcxproj	2019-04-24 14:08:16 UTC (rev 7613)
@@ -140,6 +140,11 @@
     </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\tipwin.cpp" />
+    <ClCompile Include="..\..\teraterm\common\ttlib.c" />
     <ClCompile Include="..\..\teraterm\teraterm\WSAAsyncGetAddrInfo.c" />
     <ClCompile Include="..\matcher\matcher.c" />
     <ClCompile Include="arc4random.c" />

Modified: branches/ssh_auth_dialog/ttssh2/ttxssh/ttxssh.v14.vcxproj
===================================================================
--- branches/ssh_auth_dialog/ttssh2/ttxssh/ttxssh.v14.vcxproj	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/ttssh2/ttxssh/ttxssh.v14.vcxproj	2019-04-24 14:08:16 UTC (rev 7613)
@@ -140,6 +140,11 @@
     </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\tipwin.cpp" />
+    <ClCompile Include="..\..\teraterm\common\ttlib.c" />
     <ClCompile Include="..\..\teraterm\teraterm\WSAAsyncGetAddrInfo.c" />
     <ClCompile Include="..\matcher\matcher.c" />
     <ClCompile Include="arc4random.c" />

Modified: branches/ssh_auth_dialog/ttssh2/ttxssh/ttxssh.v15.vcxproj
===================================================================
--- branches/ssh_auth_dialog/ttssh2/ttxssh/ttxssh.v15.vcxproj	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/ttssh2/ttxssh/ttxssh.v15.vcxproj	2019-04-24 14:08:16 UTC (rev 7613)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?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">
@@ -141,6 +141,11 @@
     </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\tipwin.cpp" />
+    <ClCompile Include="..\..\teraterm\common\ttlib.c" />
     <ClCompile Include="..\..\teraterm\teraterm\WSAAsyncGetAddrInfo.c" />
     <ClCompile Include="..\matcher\matcher.c" />
     <ClCompile Include="arc4random.c" />

Modified: branches/ssh_auth_dialog/ttssh2/ttxssh/ttxssh.v15.vcxproj.filters
===================================================================
--- branches/ssh_auth_dialog/ttssh2/ttxssh/ttxssh.v15.vcxproj.filters	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/ttssh2/ttxssh/ttxssh.v15.vcxproj.filters	2019-04-24 14:08:16 UTC (rev 7613)
@@ -94,6 +94,9 @@
     <ClCompile Include="..\..\teraterm\teraterm\WSAAsyncGetAddrInfo.c">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\teraterm\common\tipwin.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="arc4random.h">
@@ -221,4 +224,4 @@
       <Filter>Def File</Filter>
     </None>
   </ItemGroup>
-</Project>
+</Project>
\ No newline at end of file

Copied: branches/ssh_auth_dialog/ttssh2/ttxssh/ttxssh.v16.vcxproj (from rev 7520, branches/ssh_auth_dialog/ttssh2/ttxssh/ttxssh.v15.vcxproj)
===================================================================
--- branches/ssh_auth_dialog/ttssh2/ttxssh/ttxssh.v16.vcxproj	                        (rev 0)
+++ branches/ssh_auth_dialog/ttssh2/ttxssh/ttxssh.v16.vcxproj	2019-04-24 14:08:16 UTC (rev 7613)
@@ -0,0 +1,236 @@
+<?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>{5638BB89-44E3-4D55-BA98-A01142B4223E}</ProjectGuid>
+    <RootNamespace>ttxssh</RootNamespace>
+    <ProjectName>ttxssh</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>$(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'">
+    <PreBuildEvent>
+      <Command>"$(OutDir)puttyrev.exe"</Command>
+    </PreBuildEvent>
+    <Midl>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>Win32</TargetEnvironment>
+      <TypeLibraryName>$(OutDir)$(ProjectName).tlb</TypeLibraryName>
+      <HeaderFileName />
+    </Midl>
+    <ClCompile>
+      <AdditionalOptions>/D"_CRT_SECURE_NO_DEPRECATE" %(AdditionalOptions)</AdditionalOptions>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\teraterm\common;$(SolutionDir)..\libs\openssl\inc32;$(SolutionDir)..\teraterm\teraterm;$(SolutionDir)..\libs\zlib;$(SolutionDir)matcher;$(SolutionDir)putty;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_CRTDBG_MAP_ALLOC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <BrowseInformation>true</BrowseInformation>
+      <WarningLevel>Level3</WarningLevel>
+      <TreatWarningAsError>false</TreatWarningAsError>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\teraterm\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>odbc32.lib;odbccp32.lib;ws2_32.lib;libeay32.lib;zlibd.lib;ttpcmn.lib;dnsapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>$(SolutionDir)..\libs\openssl\out32.dbg;$(SolutionDir)..\libs\zlib;$(SolutionDir)..\teraterm\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ModuleDefinitionFile>$(ProjectName).def</ModuleDefinitionFile>
+      <DelayLoadDLLs>dnsapi.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <GenerateMapFile>true</GenerateMapFile>
+      <SubSystem>Windows</SubSystem>
+      <BaseAddress>0x12500000</BaseAddress>
+      <ImportLibrary>$(OutDir)$(ProjectName).lib</ImportLibrary>
+      <TargetMachine>MachineX86</TargetMachine>
+      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <PreBuildEvent>
+      <Command>"$(OutDir)puttyrev.exe"</Command>
+    </PreBuildEvent>
+    <Midl>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>Win32</TargetEnvironment>
+      <TypeLibraryName>$(OutDir)$(ProjectName).tlb</TypeLibraryName>
+      <HeaderFileName />
+    </Midl>
+    <ClCompile>
+      <AdditionalOptions>/D"_CRT_SECURE_NO_DEPRECATE" %(AdditionalOptions)</AdditionalOptions>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\teraterm\common;$(SolutionDir)..\libs\openssl\inc32;$(SolutionDir)..\teraterm\teraterm;$(SolutionDir)..\libs\zlib;$(SolutionDir)matcher;$(SolutionDir)putty;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <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>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\teraterm\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>odbc32.lib;odbccp32.lib;ws2_32.lib;libeay32.lib;zlib.lib;ttpcmn.lib;dnsapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>$(SolutionDir)..\libs\openssl\out32;$(SolutionDir)..\libs\zlib;$(SolutionDir)..\teraterm\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ModuleDefinitionFile>$(ProjectName).def</ModuleDefinitionFile>
+      <DelayLoadDLLs>dnsapi.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <BaseAddress>0x12500000</BaseAddress>
+      <ImportLibrary>$(OutDir)$(ProjectName).lib</ImportLibrary>
+      <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\tipwin.cpp" />
+    <ClCompile Include="..\..\teraterm\common\ttlib.c" />
+    <ClCompile Include="..\..\teraterm\teraterm\WSAAsyncGetAddrInfo.c" />
+    <ClCompile Include="..\matcher\matcher.c" />
+    <ClCompile Include="arc4random.c" />
+    <ClCompile Include="auth.c" />
+    <ClCompile Include="buffer.c" />
+    <ClCompile Include="chacha.c" />
+    <ClCompile Include="cipher-ctr.c" />
+    <ClCompile Include="crypt.c" />
+    <ClCompile Include="dns.c" />
+    <ClCompile Include="ed25519.c" />
+    <ClCompile Include="ed25519_bcrypt_pbkdf.c" />
+    <ClCompile Include="ed25519_blocks.c" />
+    <ClCompile Include="ed25519_blowfish.c" />
+    <ClCompile Include="ed25519_fe25519.c" />
+    <ClCompile Include="ed25519_ge25519.c" />
+    <ClCompile Include="ed25519_hash.c" />
+    <ClCompile Include="ed25519_sc25519.c" />
+    <ClCompile Include="ed25519_verify.c" />
+    <ClCompile Include="fwd-socks.c" />
+    <ClCompile Include="fwd.c" />
+    <ClCompile Include="fwdui.c" />
+    <ClCompile Include="hosts.c" />
+    <ClCompile Include="kex.c" />
+    <ClCompile Include="key.c" />
+    <ClCompile Include="keyfiles.c" />
+    <ClCompile Include="pkt.c" />
+    <ClCompile Include="sftp.c" />
+    <ClCompile Include="ssh.c" />
+    <ClCompile Include="ttxssh.c" />
+    <ClCompile Include="util.c" />
+    <ClCompile Include="x11util.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="arc4random.h" />
+    <ClInclude Include="auth.h" />
+    <ClInclude Include="buffer.h" />
+    <ClInclude Include="chacha.h" />
+    <ClInclude Include="cipher.h" />
+    <ClInclude Include="config.h" />
+    <ClInclude Include="crypt.h" />
+    <ClInclude Include="dns.h" />
+    <ClInclude Include="ed25519_blf.h" />
+    <ClInclude Include="ed25519_crypto_api.h" />
+    <ClInclude Include="ed25519_fe25519.h" />
+    <ClInclude Include="ed25519_ge25519.h" />
+    <ClInclude Include="ed25519_sc25519.h" />
+    <ClInclude Include="fwd-socks.h" />
+    <ClInclude Include="fwd.h" />
+    <ClInclude Include="fwdui.h" />
+    <ClInclude Include="hosts.h" />
+    <ClInclude Include="kex.h" />
+    <ClInclude Include="key.h" />
+    <ClInclude Include="keyfiles.h" />
+    <ClInclude Include="pkt.h" />
+    <ClInclude Include="resource.h" />
+    <ClInclude Include="sftp.h" />
+    <ClInclude Include="ssh.h" />
+    <ClInclude Include="ttxssh-version.h" />
+    <ClInclude Include="ttxssh.h" />
+    <ClInclude Include="util.h" />
+    <ClInclude Include="x11util.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <Image Include="ttsecure.ico" />
+    <Image Include="ttsecure_green.ico" />
+    <Image Include="ttsecure_yellow.ico" />
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="ttxssh-version.rc" />
+    <ResourceCompile Include="ttxssh.rc" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\puttyrev\puttyrev.v15.vcxproj">
+      <Project>{61eb955f-2794-4607-860f-0aa296fa58bd}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="..\putty\putty.v15.vcxproj">
+      <Project>{98ca1284-8f6c-4791-bf57-7e5fad33744e}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="ttxssh.def" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file

Copied: branches/ssh_auth_dialog/ttssh2/ttxssh/ttxssh.v16.vcxproj.filters (from rev 7520, branches/ssh_auth_dialog/ttssh2/ttxssh/ttxssh.v15.vcxproj.filters)
===================================================================
--- branches/ssh_auth_dialog/ttssh2/ttxssh/ttxssh.v16.vcxproj.filters	                        (rev 0)
+++ branches/ssh_auth_dialog/ttssh2/ttxssh/ttxssh.v16.vcxproj.filters	2019-04-24 14:08:16 UTC (rev 7613)
@@ -0,0 +1,227 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <ClCompile Include="arc4random.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="auth.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="buffer.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="chacha.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="cipher-ctr.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="crypt.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="dns.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="ed25519.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="ed25519_bcrypt_pbkdf.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="ed25519_blocks.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="ed25519_blowfish.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="ed25519_fe25519.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="ed25519_ge25519.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="ed25519_hash.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="ed25519_sc25519.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="ed25519_verify.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="fwd-socks.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="fwd.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="fwdui.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="hosts.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="kex.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="key.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="keyfiles.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\matcher\matcher.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="pkt.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="sftp.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="ssh.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="ttxssh.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="util.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="x11util.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\teraterm\teraterm\WSAAsyncGetAddrInfo.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\teraterm\common\tipwin.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="arc4random.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="chacha.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="dns.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="resource.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="ttxssh-version.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="ttxssh.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="auth.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="buffer.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="cipher.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="config.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="crypt.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="ed25519_blf.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="ed25519_crypto_api.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="ed25519_fe25519.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="ed25519_ge25519.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="ed25519_sc25519.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="fwd-socks.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="fwd.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="fwdui.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="hosts.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="kex.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="key.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="keyfiles.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="pkt.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="sftp.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="ssh.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="util.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="x11util.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <Image Include="ttsecure.ico">
+      <Filter>Resource Files</Filter>
+    </Image>
+    <Image Include="ttsecure_green.ico">
+      <Filter>Resource Files</Filter>
+    </Image>
+    <Image Include="ttsecure_yellow.ico">
+      <Filter>Resource Files</Filter>
+    </Image>
+  </ItemGroup>
+  <ItemGroup>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{bde719e1-d3ce-4efc-8f42-050f934c5441}</UniqueIdentifier>
+      <Extensions>h</Extensions>
+    </Filter>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{1402d13d-e827-4c6c-b334-555b8a086ca7}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{198016f0-824a-4e67-b7ee-51cbf3e2b34f}</UniqueIdentifier>
+      <Extensions>ico;rc</Extensions>
+    </Filter>
+    <Filter Include="Def File">
+      <UniqueIdentifier>{95d60503-2363-4800-9a4c-add18d0c56e2}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="ttxssh-version.rc">
+      <Filter>Resource Files</Filter>
+    </ResourceCompile>
+    <ResourceCompile Include="ttxssh.rc">
+      <Filter>Resource Files</Filter>
+    </ResourceCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="ttxssh.def">
+      <Filter>Def File</Filter>
+    </None>
+  </ItemGroup>
+</Project>
\ No newline at end of file

Modified: branches/ssh_auth_dialog/ttssh2/ttxssh/ttxssh.v9.vcproj
===================================================================
--- branches/ssh_auth_dialog/ttssh2/ttxssh/ttxssh.v9.vcproj	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/ttssh2/ttxssh/ttxssh.v9.vcproj	2019-04-24 14:08:16 UTC (rev 7613)
@@ -451,6 +451,26 @@
 				>
 			</File>
 			<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\tipwin.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\teraterm\common\ttlib.c"
+				>
+			</File>
+			<File
 				RelativePath="x11util.c"
 				>
 			</File>

Modified: branches/ssh_auth_dialog/ttssh2/ttxssh/ttxssh.vcproj
===================================================================
--- branches/ssh_auth_dialog/ttssh2/ttxssh/ttxssh.vcproj	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/ttssh2/ttxssh/ttxssh.vcproj	2019-04-24 14:08:16 UTC (rev 7613)
@@ -73,7 +73,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="odbc32.lib odbccp32.lib ws2_32.lib libeay32.lib zlibd.lib ttpcmn.lib dnsapi.lib"
+				AdditionalDependencies="odbc32.lib odbccp32.lib ws2_32.lib libeay32.lib zlibd.lib ttpcmn.lib dnsapi.lib user32.lib gdi32.lib SHELL32.lib comdlg32.lib advapi32.lib ole32.lib"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="$(SolutionDir)..\libs\openssl\out32.dbg;$(SolutionDir)..\libs\zlib;$(SolutionDir)..\teraterm\$(ConfigurationName)"
@@ -170,7 +170,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="odbc32.lib odbccp32.lib ws2_32.lib libeay32.lib zlib.lib ttpcmn.lib dnsapi.lib"
+				AdditionalDependencies="odbc32.lib odbccp32.lib ws2_32.lib libeay32.lib zlib.lib ttpcmn.lib dnsapi.lib user32.lib gdi32.lib SHELL32.lib comdlg32.lib advapi32.lib ole32.lib"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="$(SolutionDir)..\libs\openssl\out32;$(SolutionDir)..\libs\zlib;$(SolutionDir)..\teraterm\$(ConfigurationName)"
@@ -452,10 +452,26 @@
 				>
 			</File>
 			<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\tipwin.cpp"
 				>
 			</File>
 			<File
+				RelativePath="..\..\teraterm\common\ttlib.c"
+				>
+			</File>
+			<File
 				RelativePath="x11util.c"
 				>
 			</File>

Modified: branches/ssh_auth_dialog/ttssh2/ttxssh/util.c
===================================================================
--- branches/ssh_auth_dialog/ttssh2/ttxssh/util.c	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/ttssh2/ttxssh/util.c	2019-04-24 14:08:16 UTC (rev 7613)
@@ -322,6 +322,10 @@
 
 int UTIL_get_lang_font(PCHAR key, HWND dlg, PLOGFONT logfont, HFONT *font, PTInstVar pvar)
 {
+	LOGFONT logfont_tmp;
+	if (logfont == NULL) {
+		logfont = &logfont_tmp;
+	}
 	if (GetI18nLogfont("TTSSH", key, logfont,
 					   GetDeviceCaps(GetDC(dlg),LOGPIXELSY),
 					   pvar->ts->UILanguageFile) == FALSE) {

Modified: branches/ssh_auth_dialog/version_info.h.in
===================================================================
--- branches/ssh_auth_dialog/version_info.h.in	2019-04-24 12:51:59 UTC (rev 7612)
+++ branches/ssh_auth_dialog/version_info.h.in	2019-04-24 14:08:16 UTC (rev 7613)
@@ -1,12 +1,17 @@
 
 #cmakedefine USE_UNICODE_API
 #cmakedefine SVNVERSION @SVNVERSION@
+#cmakedefine ENABLE_DPIAWARENESS @ENABLE_DPIAWARENESS@
 
 // infos when generated
 #cmakedefine MSVC
 #cmakedefine MINGW
+// _WIN32_WINNT
+//	@_WIN32_WINNT@
 // CMAKE_GENERATOR
 //  @CMAKE_GENERATOR@
+// CMAKE_GENERATOR_TOOLSET (VS 2010 and above)
+//  @CMAKE_GENERATOR_TOOLSET@
 // CMAKE_COMMAND
 //  @CMAKE_COMMAND@
 // CMAKE_C_COMPILER


Tera Term

[Ttssh2-commit] [7613] Merge branch 'trunk' into ssh_auth_dialog