Tera TermRevision: 7693
https://osdn.net/projects/ttssh2/scm/svn/commits/7693
Author: zmatsuo
Date: 2019-05-20 00:04:55 +0900 (Mon, 20 May 2019)
Log Message:
-----------
Merge r7552 into cmake
Revision Links:
--------------
https://osdn.net/projects/ttssh2/scm/svn/commits/7552
Modified Paths:
--------------
branches/cmake/CMakeLists.txt
branches/cmake/TTXKanjiMenu/ttxkanjimenu.rc
branches/cmake/TTXSamples/TTXCommandLineOpt/CMakeLists.txt
branches/cmake/TTXSamples/TTXViewMode/CMakeLists.txt
branches/cmake/doc/convtext.bat
branches/cmake/doc/en/html/about/history.html
branches/cmake/doc/en/html/index.html
branches/cmake/doc/en/html/reference/develop.txt
branches/cmake/doc/en/teraterm.hhc
branches/cmake/doc/ja/html/reference/build_with_cmake.md
branches/cmake/doc/ja/html/reference/develop.txt
branches/cmake/doc/ja/teraterm.hhc
branches/cmake/installer/build.bat
branches/cmake/installer/check_sjis_code.pl
branches/cmake/teraterm/CMakeLists.txt
branches/cmake/teraterm/common/dllutil.cpp
branches/cmake/teraterm/common/tmfc.cpp
branches/cmake/teraterm/common/ttftypes.h
branches/cmake/teraterm/common/tttypes.h
branches/cmake/teraterm/keycode/keycode.rc
branches/cmake/teraterm/keycode/keycode.vcproj
branches/cmake/teraterm/teraterm/CMakeLists.txt
branches/cmake/teraterm/teraterm/teraterm.cpp
branches/cmake/teraterm/teraterm/ttermpro.rc
branches/cmake/teraterm/teraterm/ttermpro.v10.vcxproj
branches/cmake/teraterm/teraterm/ttermpro.v11.vcxproj
branches/cmake/teraterm/teraterm/ttermpro.v12.vcxproj
branches/cmake/teraterm/teraterm/ttermpro.v14.vcxproj
branches/cmake/teraterm/teraterm/ttermpro.v15.vcxproj
branches/cmake/teraterm/teraterm/ttermpro.v9.vcproj
branches/cmake/teraterm/teraterm/ttermpro.vcproj
branches/cmake/teraterm/teraterm/vtdisp.c
branches/cmake/teraterm/teraterm/vtdisp.h
branches/cmake/teraterm/teraterm/vtwin.cpp
branches/cmake/teraterm/ttpcmn/language.c
branches/cmake/teraterm/ttpcmn/ttcmn.c
branches/cmake/teraterm/ttpcmn/ttpcmn.v15.vcxproj
branches/cmake/teraterm/ttpcmn/ttpcmn.v15.vcxproj.filters
branches/cmake/teraterm/ttpcmn/ttpcmn.vcproj
branches/cmake/teraterm/ttpfile/ttpfile.vcproj
branches/cmake/teraterm/ttpmacro/ListDlg.cpp
branches/cmake/teraterm/ttpmacro/errdlg.cpp
branches/cmake/teraterm/ttpmacro/inpdlg.cpp
branches/cmake/teraterm/ttpmacro/msgdlg.cpp
branches/cmake/teraterm/ttpmacro/statdlg.cpp
branches/cmake/teraterm/ttpmacro/statdlg.h
branches/cmake/teraterm/ttpmacro/ttm_res.h
branches/cmake/teraterm/ttpmacro/ttmacro.cpp
branches/cmake/teraterm/ttpmacro/ttmacro.h
branches/cmake/teraterm/ttpmacro/ttmdlg.cpp
branches/cmake/teraterm/ttpmacro/ttmlib.c
branches/cmake/teraterm/ttpmacro/ttmlib.h
branches/cmake/teraterm/ttpmacro/ttmmain.cpp
branches/cmake/teraterm/ttpmacro/ttmparse.c
branches/cmake/teraterm/ttpmacro/ttpmacro.v15.vcxproj
branches/cmake/teraterm/ttpmacro/ttpmacro.v15.vcxproj.filters
branches/cmake/teraterm/ttpmacro/ttpmacro.vcproj
branches/cmake/teraterm/ttpset/ttpset.vcproj
branches/cmake/teraterm/ttptek/ttptek.vcproj
branches/cmake/tests/gui_commands_test.ttl
branches/cmake/ttpmenu/ttpmenu.rc
branches/cmake/ttssh2/ttssh/ttssh.rc
branches/cmake/ttssh2/ttxssh/keyfiles.c
branches/cmake/ttssh2/ttxssh/ssh.c
branches/cmake/ttssh2/ttxssh/ttxssh.rc
Added Paths:
-----------
branches/cmake/doc/en/html/reference/build_with_cmake.md
Removed Paths:
-------------
branches/cmake/TTProxy/TTProxy.dsp
branches/cmake/TTProxy/TTProxy.dsw
branches/cmake/teraterm/svnrev/CMakeLists.txt
branches/cmake/teraterm/ttpcmn/ttpcmn.dsp
branches/cmake/teraterm/ttpfile/ttpfile.dsp
branches/cmake/teraterm/ttpmacro/ttpmacro.dsp
branches/cmake/teraterm/ttpset/ttpset.dsp
branches/cmake/teraterm/ttptek/ttptek.dsp
branches/cmake/ttpmenu/ttpmenu.dsp
branches/cmake/ttpmenu/ttpmenu.dsw
branches/cmake/ttssh2/matcher/matcher.dsp
branches/cmake/ttssh2/ttssh/ttssh.dsp
branches/cmake/ttssh2/ttssh.dsw
branches/cmake/ttssh2/ttssh.opt
branches/cmake/ttssh2/ttxssh/ttxssh.dsp
-------------- next part --------------
Modified: branches/cmake/CMakeLists.txt
===================================================================
--- branches/cmake/CMakeLists.txt 2019-05-19 15:04:19 UTC (rev 7692)
+++ branches/cmake/CMakeLists.txt 2019-05-19 15:04:55 UTC (rev 7693)
@@ -59,8 +59,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
@@ -92,8 +98,13 @@
####
# ソースツリー内に生成ファイルが存在していたら削除する
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()
Deleted: branches/cmake/TTProxy/TTProxy.dsp
===================================================================
--- branches/cmake/TTProxy/TTProxy.dsp 2019-05-19 15:04:19 UTC (rev 7692)
+++ branches/cmake/TTProxy/TTProxy.dsp 2019-05-19 15:04:55 UTC (rev 7693)
@@ -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/cmake/TTProxy/TTProxy.dsw
===================================================================
--- branches/cmake/TTProxy/TTProxy.dsw 2019-05-19 15:04:19 UTC (rev 7692)
+++ branches/cmake/TTProxy/TTProxy.dsw 2019-05-19 15:04:55 UTC (rev 7693)
@@ -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/cmake/TTXKanjiMenu/ttxkanjimenu.rc
===================================================================
--- branches/cmake/TTXKanjiMenu/ttxkanjimenu.rc 2019-05-19 15:04:19 UTC (rev 7692)
+++ branches/cmake/TTXKanjiMenu/ttxkanjimenu.rc 2019-05-19 15:04:55 UTC (rev 7693)
@@ -7,7 +7,7 @@
//
// Generated from the TEXTINCLUDE 2 resource.
//
-//#include "afxres.h"
+#include <windows.h>
/////////////////////////////////////////////////////////////////////////////
#undef APSTUDIO_READONLY_SYMBOLS
Modified: branches/cmake/TTXSamples/TTXCommandLineOpt/CMakeLists.txt
===================================================================
--- branches/cmake/TTXSamples/TTXCommandLineOpt/CMakeLists.txt 2019-05-19 15:04:19 UTC (rev 7692)
+++ branches/cmake/TTXSamples/TTXCommandLineOpt/CMakeLists.txt 2019-05-19 15:04:55 UTC (rev 7693)
@@ -22,7 +22,6 @@
TTXCommandLineOpt
PROPERTIES
PREFIX ""
- SUFFIX ".dll"
)
target_link_libraries(
Modified: branches/cmake/TTXSamples/TTXViewMode/CMakeLists.txt
===================================================================
--- branches/cmake/TTXSamples/TTXViewMode/CMakeLists.txt 2019-05-19 15:04:19 UTC (rev 7692)
+++ branches/cmake/TTXSamples/TTXViewMode/CMakeLists.txt 2019-05-19 15:04:55 UTC (rev 7693)
@@ -48,3 +48,9 @@
#
gdi32
)
+
+set_target_properties(
+ TTXViewMode
+ PROPERTIES
+ PREFIX ""
+ )
Modified: branches/cmake/doc/convtext.bat
===================================================================
--- branches/cmake/doc/convtext.bat 2019-05-19 15:04:19 UTC (rev 7692)
+++ branches/cmake/doc/convtext.bat 2019-05-19 15:04:55 UTC (rev 7693)
@@ -17,5 +17,7 @@
%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
Modified: branches/cmake/doc/en/html/about/history.html
===================================================================
--- branches/cmake/doc/en/html/about/history.html 2019-05-19 15:04:19 UTC (rev 7692)
+++ branches/cmake/doc/en/html/about/history.html 2019-05-19 15:04:55 UTC (rev 7693)
@@ -35,7 +35,7 @@
<ul class="history">
<li>Bug fixes
<ul>
- <li><!--IME\x82̕ϊ\xB7\x8C\xF3\x95\xE2\x83E\x83B\x83\x93\x83h\x83E\x82̕\\x8E\xA6\x88ʒu\x82\xAA\x83J\x81[\x83\\x83\x8B\x88ʒu\x82ɒǏ]\x82\xB5\x82Ȃ\xA2\x96\xE2\x91\xE8\x82\xF0\x8FC\x90\xB3\x82\xB5\x82\xBD\x81B-->This bug was introduced in 4.102.</li>
+ <li>Display position of IME's conversion candidate window can not follow cursor position. This bug was introduced in 4.102.</li>
<li>Can't display character such as U+2014 EM DASH, U+2212 MINUS SIGN, U+301C WAVE DASH etc. This bug was introduced in 4.102.</li>
</ul>
</li>
Modified: branches/cmake/doc/en/html/index.html
===================================================================
--- branches/cmake/doc/en/html/index.html 2019-05-19 15:04:19 UTC (rev 7692)
+++ branches/cmake/doc/en/html/index.html 2019-05-19 15:04:55 UTC (rev 7693)
@@ -144,6 +144,9 @@
<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><A HREF="reference/build_with_cmake.html">build with CMake (experimental)</A></LI>
+ </UL>
<LI><A HREF="reference/sourcecode.html">Source Code Overview</A></LI>
</UL>
Added: branches/cmake/doc/en/html/reference/build_with_cmake.md
===================================================================
--- branches/cmake/doc/en/html/reference/build_with_cmake.md (rev 0)
+++ branches/cmake/doc/en/html/reference/build_with_cmake.md 2019-05-19 15:04:55 UTC (rev 7693)
@@ -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/cmake/doc/en/html/reference/develop.txt
===================================================================
--- branches/cmake/doc/en/html/reference/develop.txt 2019-05-19 15:04:19 UTC (rev 7692)
+++ branches/cmake/doc/en/html/reference/develop.txt 2019-05-19 15:04:55 UTC (rev 7693)
@@ -23,6 +23,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/cmake/doc/en/teraterm.hhc
===================================================================
--- branches/cmake/doc/en/teraterm.hhc 2019-05-19 15:04:19 UTC (rev 7692)
+++ branches/cmake/doc/en/teraterm.hhc 2019-05-19 15:04:55 UTC (rev 7693)
@@ -580,6 +580,13 @@
<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="Local" value="html\reference\build_with_cmake.html">
+ <param name="ImageNumber" value="11">
+ </OBJECT>
+ </UL>
<LI> <OBJECT type="text/sitemap">
<param name="Name" value="Source Code Overview">
<param name="Local" value="html\reference\sourcecode.html">
Modified: branches/cmake/doc/ja/html/reference/build_with_cmake.md
===================================================================
--- branches/cmake/doc/ja/html/reference/build_with_cmake.md 2019-05-19 15:04:19 UTC (rev 7692)
+++ branches/cmake/doc/ja/html/reference/build_with_cmake.md 2019-05-19 15:04:55 UTC (rev 7693)
@@ -1,14 +1,21 @@
-# cmakeを使ったビルド
+# cmakeを使ったビルド
-- cmake を使用してビルドすることができます(実験的な位置づけです)
- - https://cmake.org/
+- [cmake](<https://cmake.org/>)を使用して
+ ビルドすることができます(実験的な位置づけです)
## cmakeのバージョン
- Visual Studio 2005 をサポートしている cmake の最後のバージョンは 3.11.4 です
-- Visual Studio 2005 以外を使用する場合は特に制限はありません
+- Visual Studio 2005 Express では ttpmacro.exe をビルドすることができません
+- Visual Studio 2005 (Expressも含む)以外を使用する場合は特に制限はありません
- Visual Studio 2017 インストーラーで、オプションを選べば cmake をインストールできます
+## MinGW (very experimental)
+
+- MinGW を使用してバイナリを生成することができます
+- 実験的位置づけです
+- MinGW では ttpmacro.exe をビルドすることができません
+
## ライブラリのビルド
- teraterm が使用するライブラリをビルドして準備しておきます
@@ -17,19 +24,26 @@
## 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回だけです
+
+## teratermのビルド(MinGW)
+
+MinGWので使用できるcmakeを使って、
+ソースツリーのトップから、次のようにコマンドを実行します。
+
+ mkdir build_mingw_test
+ cd build_mingw_test
+ cmake .. -G "Unix Makefiles"
+ make -j4
Modified: branches/cmake/doc/ja/html/reference/develop.txt
===================================================================
--- branches/cmake/doc/ja/html/reference/develop.txt 2019-05-19 15:04:19 UTC (rev 7692)
+++ branches/cmake/doc/ja/html/reference/develop.txt 2019-05-19 15:04:55 UTC (rev 7693)
@@ -27,6 +27,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/cmake/doc/ja/teraterm.hhc
===================================================================
--- branches/cmake/doc/ja/teraterm.hhc 2019-05-19 15:04:19 UTC (rev 7692)
+++ branches/cmake/doc/ja/teraterm.hhc 2019-05-19 15:04:55 UTC (rev 7693)
@@ -589,6 +589,13 @@
<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="Local" value="html\reference\build_with_cmake.html">
+ <param name="ImageNumber" value="11">
+ </OBJECT>
+ </UL>
<LI> <OBJECT type="text/sitemap">
<param name="Name" value="\x83\\x81[\x83X\x83R\x81[\x83h\x89\xF0\x90\xE0">
<param name="Local" value="html\reference\sourcecode.html">
Modified: branches/cmake/installer/build.bat
===================================================================
--- branches/cmake/installer/build.bat 2019-05-19 15:04:19 UTC (rev 7692)
+++ branches/cmake/installer/build.bat 2019-05-19 15:04:55 UTC (rev 7693)
@@ -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/cmake/installer/check_sjis_code.pl
===================================================================
--- branches/cmake/installer/check_sjis_code.pl 2019-05-19 15:04:19 UTC (rev 7692)
+++ branches/cmake/installer/check_sjis_code.pl 2019-05-19 15:04:55 UTC (rev 7693)
@@ -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;
Modified: branches/cmake/teraterm/CMakeLists.txt
===================================================================
--- branches/cmake/teraterm/CMakeLists.txt 2019-05-19 15:04:19 UTC (rev 7692)
+++ branches/cmake/teraterm/CMakeLists.txt 2019-05-19 15:04:55 UTC (rev 7693)
@@ -14,10 +14,13 @@
ttpset
PROPERTIES FOLDER teraterm)
-add_subdirectory(ttpmacro)
-set_target_properties(
- ttpmacro
- PROPERTIES FOLDER teraterm)
+#if((NOT(${CMAKE_GENERATOR} MATCHES "Visual Studio 8 2005" AND ${CMAKE_MAKE_PROGRAM} MATCHES "VCExpress.exe")) AND (NOT(MINGW)))
+ # MFCを使用しているため VS2005 Express ではビルドできない
+ add_subdirectory(ttpmacro)
+ set_target_properties(
+ ttpmacro
+ PROPERTIES FOLDER teraterm)
+#endif()
add_subdirectory(ttptek)
set_target_properties(
Modified: branches/cmake/teraterm/common/dllutil.cpp
===================================================================
--- branches/cmake/teraterm/common/dllutil.cpp 2019-05-19 15:04:19 UTC (rev 7692)
+++ branches/cmake/teraterm/common/dllutil.cpp 2019-05-19 15:04:55 UTC (rev 7693)
@@ -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/cmake/teraterm/common/tmfc.cpp
===================================================================
--- branches/cmake/teraterm/common/tmfc.cpp 2019-05-19 15:04:19 UTC (rev 7692)
+++ branches/cmake/teraterm/common/tmfc.cpp 2019-05-19 15:04:55 UTC (rev 7693)
@@ -616,10 +616,12 @@
void TTCDialog::DestroyWindow()
{
if (m_hWnd != nullptr) {
+ HWND hWnd;
::EnableWindow(m_hParentWnd,TRUE);
::SetFocus(m_hParentWnd);
- ::DestroyWindow(m_hWnd);
+ hWnd = m_hWnd;
m_hWnd = nullptr;
+ ::DestroyWindow(hWnd);
}
}
Modified: branches/cmake/teraterm/common/ttftypes.h
===================================================================
--- branches/cmake/teraterm/common/ttftypes.h 2019-05-19 15:04:19 UTC (rev 7692)
+++ branches/cmake/teraterm/common/ttftypes.h 2019-05-19 15:04:55 UTC (rev 7693)
@@ -133,8 +133,7 @@
DWORD StartTime;
// log rotate
-// enum rotate_mode RotateMode;
- int RotateMode;
+ int RotateMode; // enum rotate_mode RotateMode;
LONG RotateSize;
int RotateStep;
Modified: branches/cmake/teraterm/common/tttypes.h
===================================================================
--- branches/cmake/teraterm/common/tttypes.h 2019-05-19 15:04:19 UTC (rev 7692)
+++ branches/cmake/teraterm/common/tttypes.h 2019-05-19 15:04:55 UTC (rev 7693)
@@ -644,8 +644,7 @@
WORD FontQuality;
char ScpSendDir[MAXPATHLEN];
char BGImageFilePath[MAX_PATH];
-// enum rotate_mode LogRotate;
- int LogRotate;
+ int LogRotate; // enum rotate_mode LogRotate;
DWORD LogRotateSize;
WORD LogRotateSizeType;
WORD LogRotateStep;
Modified: branches/cmake/teraterm/keycode/keycode.rc
===================================================================
--- branches/cmake/teraterm/keycode/keycode.rc 2019-05-19 15:04:19 UTC (rev 7692)
+++ branches/cmake/teraterm/keycode/keycode.rc 2019-05-19 15:04:55 UTC (rev 7693)
@@ -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
/////////////////////////////////////////////////////////////////////////////
Modified: branches/cmake/teraterm/keycode/keycode.vcproj
===================================================================
--- branches/cmake/teraterm/keycode/keycode.vcproj 2019-05-19 15:04:19 UTC (rev 7692)
+++ branches/cmake/teraterm/keycode/keycode.vcproj 2019-05-19 15:04:55 UTC (rev 7693)
@@ -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/cmake/teraterm/svnrev/CMakeLists.txt
===================================================================
--- branches/cmake/teraterm/svnrev/CMakeLists.txt 2019-05-19 15:04:19 UTC (rev 7692)
+++ branches/cmake/teraterm/svnrev/CMakeLists.txt 2019-05-19 15:04:55 UTC (rev 7693)
@@ -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
- )
Modified: branches/cmake/teraterm/teraterm/CMakeLists.txt
===================================================================
--- branches/cmake/teraterm/teraterm/CMakeLists.txt 2019-05-19 15:04:19 UTC (rev 7692)
+++ branches/cmake/teraterm/teraterm/CMakeLists.txt 2019-05-19 15:04:55 UTC (rev 7693)
@@ -155,7 +155,7 @@
teraterm.manifest
#
svnversion.h.in
- ${CMAKE_CURRENT_BINARY_DIR}/svnversion.h
+ ${CMAKE_CURRENT_BINARY_DIR}/../ttpdlg/svnversion.h
#
${COMMON_SRC}
${TTDLG_SRC}
@@ -217,10 +217,6 @@
ttptek
)
-configure_file(
- svnversion.h.in
- svnversion.h @ONLY)
-
# copy .lng files
if(${CMAKE_GENERATOR} MATCHES "Visual Studio 15 2017")
add_custom_target(
@@ -280,4 +276,4 @@
####
configure_file(
svnversion.h.in
- svnversion.h @ONLY)
+ ../ttpdlg/svnversion.h @ONLY)
Modified: branches/cmake/teraterm/teraterm/teraterm.cpp
===================================================================
--- branches/cmake/teraterm/teraterm/teraterm.cpp 2019-05-19 15:04:19 UTC (rev 7692)
+++ branches/cmake/teraterm/teraterm/teraterm.cpp 2019-05-19 15:04:55 UTC (rev 7693)
@@ -101,7 +101,9 @@
#endif
DLLInit();
WinCompatInit();
- if (pSetThreadDpiAwarenessContext) {
+ //SetProcessDPIAware();
+ if (pSetThreadDpiAwarenessContext != NULL) {
+ // Windows 10 Version 1703\x88ȍ~\x82̏ꍇ?
pSetThreadDpiAwarenessContext(DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE_V2);
}
LoadSpecialFont();
Modified: branches/cmake/teraterm/teraterm/ttermpro.rc
===================================================================
--- branches/cmake/teraterm/teraterm/ttermpro.rc 2019-05-19 15:04:19 UTC (rev 7692)
+++ branches/cmake/teraterm/teraterm/ttermpro.rc 2019-05-19 15:04:55 UTC (rev 7693)
@@ -484,19 +484,12 @@
// 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"
Modified: branches/cmake/teraterm/teraterm/ttermpro.v10.vcxproj
===================================================================
--- branches/cmake/teraterm/teraterm/ttermpro.v10.vcxproj 2019-05-19 15:04:19 UTC (rev 7692)
+++ branches/cmake/teraterm/teraterm/ttermpro.v10.vcxproj 2019-05-19 15:04:55 UTC (rev 7693)
@@ -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;%(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;%(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,6 +205,9 @@
<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>
Modified: branches/cmake/teraterm/teraterm/ttermpro.v11.vcxproj
===================================================================
--- branches/cmake/teraterm/teraterm/ttermpro.v11.vcxproj 2019-05-19 15:04:19 UTC (rev 7692)
+++ branches/cmake/teraterm/teraterm/ttermpro.v11.vcxproj 2019-05-19 15:04:55 UTC (rev 7693)
@@ -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;%(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;%(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,6 +202,9 @@
<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>
Modified: branches/cmake/teraterm/teraterm/ttermpro.v12.vcxproj
===================================================================
--- branches/cmake/teraterm/teraterm/ttermpro.v12.vcxproj 2019-05-19 15:04:19 UTC (rev 7692)
+++ branches/cmake/teraterm/teraterm/ttermpro.v12.vcxproj 2019-05-19 15:04:55 UTC (rev 7693)
@@ -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;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<BrowseInformation />
@@ -77,9 +77,9 @@
<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>
@@ -89,6 +89,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>
@@ -103,7 +107,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;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -118,9 +122,9 @@
<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>
@@ -130,11 +134,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" />
@@ -168,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" />
@@ -180,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" />
@@ -189,6 +204,9 @@
<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>
Modified: branches/cmake/teraterm/teraterm/ttermpro.v14.vcxproj
===================================================================
--- branches/cmake/teraterm/teraterm/ttermpro.v14.vcxproj 2019-05-19 15:04:19 UTC (rev 7692)
+++ branches/cmake/teraterm/teraterm/ttermpro.v14.vcxproj 2019-05-19 15:04:55 UTC (rev 7693)
@@ -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;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<BrowseInformation />
@@ -76,12 +76,12 @@
<ResourceCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<Culture>0x0411</Culture>
- <AdditionalIncludeDirectories>$(SolutionDir)common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>$(SolutionDir)..\libs\oniguruma\src;$(SolutionDir)common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
- <AdditionalDependencies>nafxcwd.lib;LIBCMTD.lib;ws2_32.lib;imagehlp.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <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>
@@ -91,6 +91,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;%(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>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>
@@ -132,11 +136,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" />
@@ -170,6 +182,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 +196,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,6 +206,9 @@
<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>
Modified: branches/cmake/teraterm/teraterm/ttermpro.v15.vcxproj
===================================================================
--- branches/cmake/teraterm/teraterm/ttermpro.v15.vcxproj 2019-05-19 15:04:19 UTC (rev 7692)
+++ branches/cmake/teraterm/teraterm/ttermpro.v15.vcxproj 2019-05-19 15:04:55 UTC (rev 7693)
@@ -65,7 +65,7 @@
<ClCompile>
<AdditionalOptions>/D"_CRT_SECURE_NO_DEPRECATE" %(AdditionalOptions)</AdditionalOptions>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>.;$(SolutionDir)..\libs\oniguruma\src;$(SolutionDir)common;$(SolutionDir)ttpfile;$(SolutionDir)ttpdlg;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>$(SolutionDir)..\libs\oniguruma\src;$(SolutionDir)common;$(SolutionDir)ttpfile;$(SolutionDir)ttpdlg;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<BrowseInformation />
@@ -78,10 +78,10 @@
<ResourceCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<Culture>0x0411</Culture>
- <AdditionalIncludeDirectories>.;$(SolutionDir)..\libs\oniguruma\src;$(SolutionDir)common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>$(SolutionDir)..\libs\oniguruma\src;$(SolutionDir)common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
- <AdditionalDependencies>LIBCMTD.lib;onig_sd.lib;comctl32.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>$(SolutionDir)..\libs\oniguruma\src;$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<DelayLoadDLLs>imagehlp.dll;user32.dll;shell32.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
@@ -94,8 +94,8 @@
<AdditionalManifestFiles>.\teraterm.manifest %(AdditionalManifestFiles)</AdditionalManifestFiles>
</Manifest>
<PreBuildEvent>
- <Command>"$(OutDir)svnrev.exe" "$(SolutionDir)..\libs\svn\bin\svnversion.exe" "$(SolutionDir).." "$(ProjectDir)svnversion.h"</Command>
- <Message>creating "$(ProjectDir)svnversion.h"</Message>
+ <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'">
@@ -111,7 +111,7 @@
<AdditionalOptions>/D"_CRT_SECURE_NO_DEPRECATE" %(AdditionalOptions)</AdditionalOptions>
<Optimization>MaxSpeed</Optimization>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
- <AdditionalIncludeDirectories>.;$(SolutionDir)..\libs\oniguruma\src;$(SolutionDir)common;$(SolutionDir)ttpfile;$(SolutionDir)ttpdlg;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>$(SolutionDir)..\libs\oniguruma\src;$(SolutionDir)common;$(SolutionDir)ttpfile;$(SolutionDir)ttpdlg;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -127,7 +127,7 @@
<AdditionalIncludeDirectories>$(SolutionDir)common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
- <AdditionalDependencies>LIBCMT.lib;onig_s.lib;comctl32.lib;ws2_32.lib;imagehlp.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>onig_s.lib;comctl32.lib;ws2_32.lib;imagehlp.lib;%(AdditionalDependencies)</AdditionalDependencies>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>$(SolutionDir)..\libs\oniguruma\src;$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<DelayLoadDLLs>imagehlp.dll;user32.dll;shell32.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
@@ -141,8 +141,8 @@
<AdditionalManifestFiles>.\teraterm.manifest %(AdditionalManifestFiles)</AdditionalManifestFiles>
</Manifest>
<PreBuildEvent>
- <Message>creating "$(ProjectDir)svnversion.h"</Message>
- <Command>"$(OutDir)svnrev.exe" "$(SolutionDir)..\libs\svn\bin\svnversion.exe" "$(SolutionDir).." "$(ProjectDir)svnversion.h"</Command>
+ <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>
Modified: branches/cmake/teraterm/teraterm/ttermpro.v9.vcproj
===================================================================
--- branches/cmake/teraterm/teraterm/ttermpro.v9.vcproj 2019-05-19 15:04:19 UTC (rev 7692)
+++ branches/cmake/teraterm/teraterm/ttermpro.v9.vcproj 2019-05-19 15:04:55 UTC (rev 7693)
@@ -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/cmake/teraterm/teraterm/ttermpro.vcproj
===================================================================
--- branches/cmake/teraterm/teraterm/ttermpro.vcproj 2019-05-19 15:04:19 UTC (rev 7692)
+++ branches/cmake/teraterm/teraterm/ttermpro.vcproj 2019-05-19 15:04:55 UTC (rev 7693)
@@ -25,8 +25,8 @@
>
<Tool
Name="VCPreBuildEventTool"
- Description="creating "$(ProjectDir)svnversion.h""
- CommandLine=""$(OutDir)\svnrev.exe" "$(SolutionDir)..\libs\svn\bin\svnversion.exe" "$(SolutionDir).." "$(ProjectDir)svnversion.h""
+ Description="creating "$(ProjectDir)..\ttpdlg\svnversion.h""
+ CommandLine=""$(OutDir)\svnrev.exe" "$(SolutionDir)..\libs\svn\bin\svnversion.exe" "$(SolutionDir).." "$(ProjectDir)..\ttpdlg\svnversion.h""
/>
<Tool
Name="VCCustomBuildTool"
@@ -50,7 +50,7 @@
Name="VCCLCompilerTool"
AdditionalOptions="/D"_CRT_SECURE_NO_DEPRECATE""
Optimization="0"
- AdditionalIncludeDirectories=".;$(SolutionDir)..\libs\oniguruma\src;$(SolutionDir)common;$(SolutionDir)ttpfile;$(SolutionDir)ttpdlg"
+ AdditionalIncludeDirectories="$(SolutionDir)..\libs\oniguruma\src;$(SolutionDir)common;$(SolutionDir)ttpfile;$(SolutionDir)ttpdlg"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
RuntimeLibrary="1"
BrowseInformation="0"
@@ -73,7 +73,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="onig_sd.lib comctl32.lib 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="$(SolutionDir)..\libs\oniguruma\src;$(OutDir)"
@@ -119,8 +119,8 @@
>
<Tool
Name="VCPreBuildEventTool"
- Description="creating "$(ProjectDir)svnversion.h""
- CommandLine=""$(OutDir)\svnrev.exe" "$(SolutionDir)..\libs\svn\bin\svnversion.exe" "$(SolutionDir).." "$(ProjectDir)svnversion.h""
+ Description="creating "$(ProjectDir)..\ttpdlg\svnversion.h""
+ CommandLine=""$(OutDir)\svnrev.exe" "$(SolutionDir)..\libs\svn\bin\svnversion.exe" "$(SolutionDir).." "$(ProjectDir)..\ttpdlg\svnversion.h""
/>
<Tool
Name="VCCustomBuildTool"
@@ -145,7 +145,7 @@
AdditionalOptions="/D"_CRT_SECURE_NO_DEPRECATE""
Optimization="2"
InlineFunctionExpansion="1"
- AdditionalIncludeDirectories=".;$(SolutionDir)..\libs\oniguruma\src;$(SolutionDir)common;$(SolutionDir)ttpfile;$(SolutionDir)ttpdlg"
+ AdditionalIncludeDirectories="$(SolutionDir)..\libs\oniguruma\src;$(SolutionDir)common;$(SolutionDir)ttpfile;$(SolutionDir)ttpdlg"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
StringPooling="true"
RuntimeLibrary="0"
@@ -168,7 +168,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="onig_s.lib comctl32.lib 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="$(SolutionDir)..\libs\oniguruma\src;$(OutDir)"
Modified: branches/cmake/teraterm/teraterm/vtdisp.c
===================================================================
--- branches/cmake/teraterm/teraterm/vtdisp.c 2019-05-19 15:04:19 UTC (rev 7692)
+++ branches/cmake/teraterm/teraterm/vtdisp.c 2019-05-19 15:04:55 UTC (rev 7693)
@@ -114,7 +114,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 */
@@ -171,20 +171,20 @@
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;
static HDC hdcBGWork;
static HDC hdcBGBuffer;
@@ -1911,7 +1911,7 @@
*Yw = (Ys - WinOrgY) * FontHeight;
}
-static void SetLogFont(LOGFONTA *VTlf)
+static void SetLogFont(LOGFONTA *VTlf, BOOL mul)
{
memset(VTlf, 0, sizeof(*VTlf));
VTlf->lfWeight = FW_NORMAL;
@@ -1926,101 +1926,107 @@
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;
- LOGFONTA VTlf;
+ 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]);
+ }
- {
- HDC TmpDC = GetDC(HVTWin);
- UINT uDpi;
+ {
+ HDC TmpDC = GetDC(HVTWin);
- /* Normal Font */
- SetLogFont(&VTlf);
- if (pGetDpiForWindow == NULL) {
- uDpi = GetDeviceCaps(TmpDC,LOGPIXELSY); // \x82\xA2\x82\xE096\x82\xF0\x95Ԃ\xB7?
- } else {
- uDpi = pGetDpiForWindow(HVTWin);
- }
- VTlf.lfWidth = -MulDiv(VTlf.lfWidth, uDpi, 72);
- VTlf.lfHeight = -MulDiv(VTlf.lfHeight, uDpi, 72);
- VTFont[0] = CreateFontIndirect(&VTlf);
+ /* Normal Font */
+ SetLogFont(&VTlf, TRUE);
+ VTFont[0] = CreateFontIndirect(&VTlf);
- /* set IME font */
- SetConversionLogFont(HVTWin, &VTlf);
+ /* 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];
+ }
- for (i = 0 ; i < TermWidthMax; i++)
- Dx[i] = FontWidth;
+ for (i = 0 ; i < TermWidthMax; i++)
+ Dx[i] = FontWidth;
}
void ResetIME()
@@ -2046,7 +2052,7 @@
{
if (ts.IMEInline>0) {
LOGFONTA VTlf;
- SetLogFont(&VTlf);
+ SetLogFont(&VTlf, TRUE);
SetConversionLogFont(HVTWin, &VTlf);
}
else
@@ -2205,11 +2211,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);
}
@@ -3332,7 +3338,7 @@
ts.VTFlag = 1;
if (! LoadTTDLG()) return;
- SetLogFont(&VTlf);
+ SetLogFont(&VTlf, FALSE);
Ok = ChooseFontDlg(HVTWin,&VTlf,&ts);
FreeTTDLG();
if (! Ok) return;
Modified: branches/cmake/teraterm/teraterm/vtdisp.h
===================================================================
--- branches/cmake/teraterm/teraterm/vtdisp.h 2019-05-19 15:04:19 UTC (rev 7692)
+++ branches/cmake/teraterm/teraterm/vtdisp.h 2019-05-19 15:04:55 UTC (rev 7693)
@@ -130,7 +130,7 @@
extern TCharAttr DefCharAttr;
extern BOOL IMEstat;
-extern BOOL IMEShowingCandidate;
+extern BOOL IMECompositionState;
#define SCROLL_BOTTOM 1
#define SCROLL_LINEDOWN 2
Modified: branches/cmake/teraterm/teraterm/vtwin.cpp
===================================================================
--- branches/cmake/teraterm/teraterm/vtwin.cpp 2019-05-19 15:04:19 UTC (rev 7692)
+++ branches/cmake/teraterm/teraterm/vtwin.cpp 2019-05-19 15:04:55 UTC (rev 7693)
@@ -3129,7 +3129,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;
@@ -3141,7 +3141,7 @@
LRESULT CVTWindow::OnIMEEndComposition(WPARAM wParam, LPARAM lParam)
{
- IMEShowingCandidate = FALSE;
+ IMECompositionState = FALSE;
return CFrameWnd::DefWindowProc(WM_IME_ENDCOMPOSITION,wParam,lParam);
}
@@ -3210,16 +3210,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;
}
Modified: branches/cmake/teraterm/ttpcmn/language.c
===================================================================
--- branches/cmake/teraterm/ttpcmn/language.c 2019-05-19 15:04:19 UTC (rev 7692)
+++ branches/cmake/teraterm/ttpcmn/language.c 2019-05-19 15:04:55 UTC (rev 7693)
@@ -34,10 +34,9 @@
#undef DllExport
#include "teraterm.h"
#include "tttypes.h"
-#include <mbstring.h>
-#include <locale.h>
#include "codemap.h"
+#define DllExport __declspec(dllexport)
#include "language.h"
#if !defined(DllExport)
@@ -48,7 +47,7 @@
#endif
#endif
-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;
Modified: branches/cmake/teraterm/ttpcmn/ttcmn.c
===================================================================
--- branches/cmake/teraterm/ttpcmn/ttcmn.c 2019-05-19 15:04:19 UTC (rev 7692)
+++ branches/cmake/teraterm/ttpcmn/ttcmn.c 2019-05-19 15:04:55 UTC (rev 7693)
@@ -52,9 +52,12 @@
#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
Deleted: branches/cmake/teraterm/ttpcmn/ttpcmn.dsp
===================================================================
--- branches/cmake/teraterm/ttpcmn/ttpcmn.dsp 2019-05-19 15:04:19 UTC (rev 7692)
+++ branches/cmake/teraterm/ttpcmn/ttpcmn.dsp 2019-05-19 15:04:55 UTC (rev 7693)
@@ -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
Modified: branches/cmake/teraterm/ttpcmn/ttpcmn.v15.vcxproj
===================================================================
--- branches/cmake/teraterm/ttpcmn/ttpcmn.v15.vcxproj 2019-05-19 15:04:19 UTC (rev 7692)
+++ branches/cmake/teraterm/ttpcmn/ttpcmn.v15.vcxproj 2019-05-19 15:04:55 UTC (rev 7693)
@@ -152,9 +152,8 @@
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="ttpcmn-version.rc" />
- <ResourceCompile Include="ttpcmn.rc" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
-</Project>
+</Project>
\ No newline at end of file
Modified: branches/cmake/teraterm/ttpcmn/ttpcmn.v15.vcxproj.filters
===================================================================
--- branches/cmake/teraterm/ttpcmn/ttpcmn.v15.vcxproj.filters 2019-05-19 15:04:19 UTC (rev 7692)
+++ branches/cmake/teraterm/ttpcmn/ttpcmn.v15.vcxproj.filters 2019-05-19 15:04:55 UTC (rev 7693)
@@ -64,8 +64,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
Modified: branches/cmake/teraterm/ttpcmn/ttpcmn.vcproj
===================================================================
--- branches/cmake/teraterm/ttpcmn/ttpcmn.vcproj 2019-05-19 15:04:19 UTC (rev 7692)
+++ branches/cmake/teraterm/ttpcmn/ttpcmn.vcproj 2019-05-19 15:04:55 UTC (rev 7693)
@@ -71,7 +71,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="setupapi.lib"
+ AdditionalDependencies="User32.lib gdi32.lib SHELL32.lib ADVAPI32.lib ole32.lib setupapi.lib"
LinkIncremental="1"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=""
@@ -163,7 +163,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="setupapi.lib"
+ AdditionalDependencies="User32.lib gdi32.lib SHELL32.lib ADVAPI32.lib ole32.lib setupapi.lib"
LinkIncremental="1"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=""
@@ -213,10 +213,6 @@
>
</File>
<File
- RelativePath="..\common\dlglib.c"
- >
- </File>
- <File
RelativePath="..\common\i18n.c"
>
</File>
@@ -279,10 +275,6 @@
RelativePath="ttpcmn-version.rc"
>
</File>
- <File
- RelativePath="ttpcmn.rc"
- >
- </File>
</Filter>
</Files>
<Globals>
Deleted: branches/cmake/teraterm/ttpfile/ttpfile.dsp
===================================================================
--- branches/cmake/teraterm/ttpfile/ttpfile.dsp 2019-05-19 15:04:19 UTC (rev 7692)
+++ branches/cmake/teraterm/ttpfile/ttpfile.dsp 2019-05-19 15:04:55 UTC (rev 7693)
@@ -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/cmake/teraterm/ttpfile/ttpfile.vcproj
===================================================================
--- branches/cmake/teraterm/ttpfile/ttpfile.vcproj 2019-05-19 15:04:19 UTC (rev 7692)
+++ branches/cmake/teraterm/ttpfile/ttpfile.vcproj 2019-05-19 15:04:55 UTC (rev 7693)
@@ -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/cmake/teraterm/ttpmacro/ListDlg.cpp
===================================================================
--- branches/cmake/teraterm/ttpmacro/ListDlg.cpp 2019-05-19 15:04:19 UTC (rev 7692)
+++ branches/cmake/teraterm/ttpmacro/ListDlg.cpp 2019-05-19 15:04:55 UTC (rev 7693)
@@ -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
@@ -69,11 +69,9 @@
};
const TCHAR **p;
int ListMaxWidth = 0;
- int ListWidth;
int ListCount = 0;
HDC DC;
RECT R;
- HDC TmpDC;
HWND HList, HOk;
SetDlgTexts(m_hWnd, TextInfos, _countof(TextInfos), UILanguageFile);
@@ -84,6 +82,7 @@
p = m_Lists;
while (*p) {
SIZE size;
+ int ListWidth;
SendDlgItemMessage(IDC_LISTBOX, LB_ADDSTRING, 0, (LPARAM)(*p));
GetTextExtentPoint32(DC, *p, _tcslen(*p), &size);
ListWidth = size.cx;
@@ -95,7 +94,7 @@
}
SendDlgItemMessage(IDC_LISTBOX, LB_SETHORIZONTALEXTENT, (ListMaxWidth + 5), 0);
- ::ReleaseDC(m_hWnd, DC);
+ ::ReleaseDC(HList, DC);
if (m_Selected < 0 || m_Selected >= ListCount) {
m_Selected = 0;
@@ -106,9 +105,7 @@
SetDlgItemText(IDC_LISTTEXT, m_Text);
SetWindowText(m_Caption);
- TmpDC = ::GetDC(GetDlgItem(IDC_LISTTEXT));
- CalcTextExtent(TmpDC,m_Text,&s);
- ::ReleaseDC(GetDlgItem(IDC_LISTTEXT), TmpDC);
+ CalcTextExtent(GetDlgItem(IDC_LISTTEXT), NULL, m_Text,&s);
TW = s.cx + s.cx/10;
TH = s.cy;
@@ -163,7 +160,7 @@
::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
@@ -175,8 +172,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 {
@@ -190,9 +187,9 @@
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(m_hWnd, &R);
Modified: branches/cmake/teraterm/ttpmacro/errdlg.cpp
===================================================================
--- branches/cmake/teraterm/ttpmacro/errdlg.cpp 2019-05-19 15:04:19 UTC (rev 7692)
+++ branches/cmake/teraterm/ttpmacro/errdlg.cpp 2019-05-19 15:04:55 UTC (rev 7693)
@@ -36,12 +36,9 @@
#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>
@@ -48,7 +45,7 @@
#include "dlglib.h"
#include "ttmacro.h"
-// CErrDlg dialog
+#include "errdlg.h"
CErrDlg::CErrDlg(const TCHAR *Msg, const TCHAR *Line, int x, int y, int lineno, int start, int end, const TCHAR *FileName)
{
Modified: branches/cmake/teraterm/ttpmacro/inpdlg.cpp
===================================================================
--- branches/cmake/teraterm/ttpmacro/inpdlg.cpp 2019-05-19 15:04:19 UTC (rev 7692)
+++ branches/cmake/teraterm/ttpmacro/inpdlg.cpp 2019-05-19 15:04:55 UTC (rev 7693)
@@ -36,6 +36,7 @@
#include "ttmlib.h"
#include "dlglib.h"
#include "ttmacro.h"
+#include "compat_win.h"
#include "inpdlg.h"
@@ -74,7 +75,7 @@
SetDlgItemText(IDC_INPTEXT,TextStr);
SetDlgItemText(IDC_INPEDIT,DefaultStr);
- CalcTextExtent2(GetDlgItem(IDC_STATTEXT), NULL, TextStr, &s);
+ CalcTextExtent(GetDlgItem(IDC_INPTEXT), NULL, TextStr, &s);
TW = s.cx + s.cx/10;
TH = s.cy;
@@ -187,6 +188,13 @@
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/cmake/teraterm/ttpmacro/msgdlg.cpp
===================================================================
--- branches/cmake/teraterm/ttpmacro/msgdlg.cpp 2019-05-19 15:04:19 UTC (rev 7692)
+++ branches/cmake/teraterm/ttpmacro/msgdlg.cpp 2019-05-19 15:04:55 UTC (rev 7693)
@@ -39,6 +39,7 @@
#include "dlglib.h"
#include "ttmdlg.h"
#include "ttmacro.h"
+#include "compat_win.h"
#include "msgdlg.h"
@@ -81,7 +82,7 @@
SetWindowText(TitleStr);
SetDlgItemText(IDC_MSGTEXT,TextStr);
- CalcTextExtent2(GetDlgItem(IDC_STATTEXT), NULL, TextStr, &s);
+ CalcTextExtent(GetDlgItem(IDC_MSGTEXT), NULL, TextStr, &s);
TW = s.cx + s.cx/10;
TH = s.cy;
@@ -106,7 +107,7 @@
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) {
@@ -206,6 +207,13 @@
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/cmake/teraterm/ttpmacro/statdlg.cpp
===================================================================
--- branches/cmake/teraterm/ttpmacro/statdlg.cpp 2019-05-19 15:04:19 UTC (rev 7692)
+++ branches/cmake/teraterm/ttpmacro/statdlg.cpp 2019-05-19 15:04:55 UTC (rev 7693)
@@ -29,6 +29,8 @@
/* TTMACRO.EXE, status dialog box */
+#include <assert.h>
+#include <crtdbg.h>
#include "teraterm.h"
#include "ttlib.h"
#include "ttm_res.h"
@@ -35,22 +37,12 @@
#include "ttmlib.h"
#include "tmfc.h"
#include "tttypes.h"
+#include "ttmacro.h"
#include "statdlg.h"
// CStatDlg dialog
-#if 0
-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()
-#endif
-
-extern HINSTANCE GetInstance();
-
BOOL CStatDlg::Create(const TCHAR *Text, const TCHAR *Title, int x, int y)
{
TextStr = Text;
@@ -57,7 +49,6 @@
TitleStr = Title;
PosX = x;
PosY = y;
-// DlgFont = NULL;
HINSTANCE hInst = GetInstance();
return TTCDialog::Create(hInst, GetDesktopWindow(), CStatDlg::IDD);
}
@@ -80,7 +71,7 @@
if (Text!=NULL) {
SIZE textSize;
HWND hWnd = GetDlgItem(IDC_STATTEXT);
- CalcTextExtent2(hWnd, NULL, Text, &textSize);
+ CalcTextExtent(hWnd, NULL, Text, &textSize);
TW = textSize.cx + textSize.cx/10; // (cx * (1+0.1)) ?
TH = textSize.cy;
s = textSize; // TODO s!?
@@ -101,20 +92,9 @@
BOOL CStatDlg::OnInitDialog()
{
-#if 0
- LOGFONT logfont;
- HFONT font;
-#endif
Update(TextStr,TitleStr,PosX,PosY);
SetForegroundWindow(m_hWnd);
-#if 0
- 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));
- }
-#endif
return TRUE;
}
@@ -147,15 +127,6 @@
BOOL CStatDlg::PostNcDestroy()
{
-#if 0
- // 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;
- }
-#endif
delete this;
return TRUE;
}
Modified: branches/cmake/teraterm/ttpmacro/statdlg.h
===================================================================
--- branches/cmake/teraterm/ttpmacro/statdlg.h 2019-05-19 15:04:19 UTC (rev 7692)
+++ branches/cmake/teraterm/ttpmacro/statdlg.h 2019-05-19 15:04:55 UTC (rev 7693)
@@ -41,7 +41,6 @@
const TCHAR *TitleStr;
int PosX, PosY, init_WW, WW, WH, TW, TH;
SIZE s;
-// HFONT DlgFont;
virtual BOOL OnInitDialog();
virtual BOOL OnOK();
Modified: branches/cmake/teraterm/ttpmacro/ttm_res.h
===================================================================
--- branches/cmake/teraterm/ttpmacro/ttm_res.h 2019-05-19 15:04:19 UTC (rev 7692)
+++ branches/cmake/teraterm/ttpmacro/ttm_res.h 2019-05-19 15:04:55 UTC (rev 7693)
@@ -22,14 +22,14 @@
#define IDC_LISTBOX 602
#define IDC_MACROERRHELP 603
#define IDC_LISTTEXT 604
-#define IDC_EDIT_ERRLINE 606
-#define IDC_FILENAME 607
+#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 603
+#define _APS_NEXT_RESOURCE_VALUE 607
#define _APS_NEXT_COMMAND_VALUE 32771
#define _APS_NEXT_CONTROL_VALUE 607
#define _APS_NEXT_SYMED_VALUE 101
Modified: branches/cmake/teraterm/ttpmacro/ttmacro.cpp
===================================================================
--- branches/cmake/teraterm/ttpmacro/ttmacro.cpp 2019-05-19 15:04:19 UTC (rev 7692)
+++ branches/cmake/teraterm/ttpmacro/ttmacro.cpp 2019-05-19 15:04:55 UTC (rev 7693)
@@ -33,55 +33,52 @@
#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"
-#include "compat_win.h"
-#include "ttmdlg.h"
-#include "tmfc.h"
-#include "dlglib.h"
-
#ifdef _DEBUG
#define new new(_NORMAL_BLOCK, __FILE__, __LINE__)
#endif
char UILanguageFile[MAX_PATH];
+static HWND CtrlWnd;
+static HINSTANCE hInst;
+
static BOOL Busy;
-static HINSTANCE hInst;
static CCtrlWindow *pCCtrlWindow;
-static void init()
+HINSTANCE GetInstance()
{
- typedef BOOL (WINAPI *pSetDllDir)(LPCSTR);
- typedef BOOL (WINAPI *pSetDefDllDir)(DWORD);
+ return hInst;
+}
- HMODULE module;
- pSetDllDir setDllDir;
- pSetDefDllDir setDefDllDir;
+HWND GetHWND()
+{
+ return CtrlWnd;
+}
- if ((module = GetModuleHandleA("kernel32.dll")) != NULL) {
- if ((setDefDllDir = (pSetDefDllDir)GetProcAddress(module, "SetDefaultDllDirectories")) != NULL) {
- // SetDefaultDllDirectories() \x82\xAA\x8Eg\x82\xA6\x82\xE9\x8Fꍇ\x82́A\x8C\x9F\x8D\xF5\x83p\x83X\x82\xF0 %WINDOWS%\system32 \x82݂̂ɐݒ肷\x82\xE9
- (*setDefDllDir)((DWORD)0x00000800); // LOAD_LIBRARY_SEARCH_SYSTEM32
- }
- 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)("");
- }
- }
-
+static void init()
+{
+ DLLInit();
WinCompatInit();
if (pSetThreadDpiAwarenessContext) {
pSetThreadDpiAwarenessContext(DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE_V2);
}
+ // messagebox\x82̃t\x83H\x83\x93\x83g\x82ɐݒ肷\x82\xE9
+ SetDialogFont(NULL, NULL, NULL);
}
// TTMACRO main engine
@@ -108,18 +105,6 @@
// CCtrlApp theApp;
-static HWND CtrlWnd;
-
-HINSTANCE GetInstance()
-{
- return hInst;
-}
-
-HWND GetHWND()
-{
- return CtrlWnd;
-}
-
/////////////////////////////////////////////////////////////////////////////
int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPreInst,
@@ -126,7 +111,6 @@
LPSTR lpszCmdLine, int nCmdShow)
{
hInst = hInstance;
-// static HMODULE HTTSET = NULL;
LONG lCount = 0;
DWORD SleepTick = 1;
@@ -135,14 +119,12 @@
#endif
init();
- InitCommonControls();
+// InitCommonControls();
GetUILanguageFile(UILanguageFile, sizeof(UILanguageFile));
- SetDialogFont(NULL, UILanguageFile, NULL);
Busy = TRUE;
pCCtrlWindow = new CCtrlWindow();
pCCtrlWindow->Create();
-// pCCtrlWindow->ShowWindow(SW_SHOW);
Busy = FALSE;
HWND hWnd = pCCtrlWindow->GetSafeHwnd();
@@ -151,18 +133,6 @@
//////////////////////////////////////////////////////////////////////
MSG msg;
while (GetMessage(&msg, NULL, 0, 0)) {
-#if 0
- 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;
- }
- }
- }
-#endif
if (IsDialogMessage(hWnd, &msg) != 0) {
/* \x8F\x88\x97\x9D\x82\xB3\x82ꂽ*/
@@ -170,12 +140,6 @@
TranslateMessage(&msg);
DispatchMessage(&msg);
}
-#if 0
- if (!message_processed) {
- TranslateMessage(&msg);
- DispatchMessage(&msg);
- }
-#endif
while (!PeekMessage(&msg, NULL, NULL, NULL, PM_NOREMOVE)) {
// \x83\x81\x83b\x83Z\x81[\x83W\x82\xAA\x82Ȃ\xA2
@@ -194,8 +158,6 @@
}
}
- //////////////////////////////////////////////////////////////////////
-
// 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();
Modified: branches/cmake/teraterm/ttpmacro/ttmacro.h
===================================================================
--- branches/cmake/teraterm/ttpmacro/ttmacro.h 2019-05-19 15:04:19 UTC (rev 7692)
+++ branches/cmake/teraterm/ttpmacro/ttmacro.h 2019-05-19 15:04:55 UTC (rev 7693)
@@ -29,28 +29,5 @@
/* TTMACRO.EXE, main */
-/////////////////////////////////////////////////////////////////////////////
-// CCtrlApp:
-
-#if 0
-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()
-};
-#endif
-
HINSTANCE GetInstance();
HWND GetHWND();
Modified: branches/cmake/teraterm/ttpmacro/ttmdlg.cpp
===================================================================
--- branches/cmake/teraterm/ttpmacro/ttmdlg.cpp 2019-05-19 15:04:19 UTC (rev 7692)
+++ branches/cmake/teraterm/ttpmacro/ttmdlg.cpp 2019-05-19 15:04:55 UTC (rev 7693)
@@ -34,6 +34,7 @@
#include <commdlg.h>
#include <crtdbg.h>
#include <tchar.h>
+#include <assert.h>
#include "teraterm.h"
#include "ttm_res.h"
@@ -49,6 +50,8 @@
#include "ttmdlg.h"
#include "ttmacro.h"
+#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__)
@@ -279,7 +282,9 @@
if (StatDlg==NULL) {
return;
}
+ assert(_CrtCheckMemory());
StatDlg->DestroyWindow();
+ assert(_CrtCheckMemory());
StatDlg = NULL;
}
Modified: branches/cmake/teraterm/ttpmacro/ttmlib.c
===================================================================
--- branches/cmake/teraterm/ttpmacro/ttmlib.c 2019-05-19 15:04:19 UTC (rev 7692)
+++ branches/cmake/teraterm/ttpmacro/ttmlib.c 2019-05-19 15:04:55 UTC (rev 7693)
@@ -36,6 +36,9 @@
#include <shlobj.h>
#include <tchar.h>
+#include "compat_win.h"
+#include "ttmlib.h"
+
static char CurrentDir[MAXPATHLEN];
typedef struct {
@@ -63,44 +66,62 @@
{ NULL, -1}
};
-void CalcTextExtent(HDC DC, const TCHAR *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 TCHAR *Text, LPSIZE s)
{
- int W, H, i, i0;
- TCHAR Temp[512];
- DWORD dwExt;
+ HDC DC = GetDC(hWnd);
+ int W, H, i, i0;
+ TCHAR 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],sizeof(TCHAR) * (i-i0));
- Temp[i-i0] = 0;
- if (Temp[0]==0)
- {
- Temp[0] = 0x20;
- Temp[1] = 0;
- }
- dwExt = GetTabbedTextExtent(DC,Temp,_tcslen(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,_tcslen(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)
@@ -218,25 +239,8 @@
}
}
-/**
- * \x95\xB6\x8E\x9A\x82\xF0\x95`\x89悵\x82\xBD\x8E\x9E\x82ǂ\xF1\x82Ȕ͈͂ɂȂ邩\x8Cv\x8EZ\x82\xB7\x82\xE9
- */
-void CalcTextExtent2(HWND hWnd, HFONT Font, const TCHAR *Text, LPSIZE textSize)
+int MessageBoxHaltScript(HWND hWnd)//, const char *UILanguageFile)
{
- HDC TmpDC = GetDC(hWnd);
- HFONT prevFont = NULL;
- if (Font) {
- prevFont = (HFONT)SelectObject(TmpDC, Font);
- }
- CalcTextExtent(TmpDC, Text, textSize);
- if (Font && prevFont != NULL) {
- SelectObject(TmpDC, prevFont);
- }
- ReleaseDC(hWnd, TmpDC);
-}
-
-int MessageBoxHaltScript(HWND hWnd, const char *UILanguageFile)
-{
TCHAR uimsg[MAX_UIMSG];
TCHAR uimsg2[MAX_UIMSG];
get_lang_msgT("MSG_MACRO_CONF", uimsg, _countof(uimsg), _T("MACRO: confirmation"), UILanguageFile);
Modified: branches/cmake/teraterm/ttpmacro/ttmlib.h
===================================================================
--- branches/cmake/teraterm/ttpmacro/ttmlib.h 2019-05-19 15:04:19 UTC (rev 7692)
+++ branches/cmake/teraterm/ttpmacro/ttmlib.h 2019-05-19 15:04:55 UTC (rev 7693)
@@ -29,6 +29,10 @@
// TTMACRO.EXE, misc routines
+#pragma once
+
+#include <windows.h>
+
#ifdef __cplusplus
extern "C" {
#endif
@@ -35,8 +39,7 @@
extern char UILanguageFile[MAX_PATH];
-void CalcTextExtent(HDC DC, const TCHAR *Text, LPSIZE s);
-void CalcTextExtent2(HWND hWnd, HFONT Font, const TCHAR *Text, LPSIZE textSize); // TODO name
+void CalcTextExtent(HWND hWnd, HFONT Font, const TCHAR *Text, LPSIZE s);
void TTMGetDir(PCHAR Dir, int destlen);
void TTMSetDir(PCHAR Dir);
int GetAbsPath(PCHAR FName, int destlen);
Modified: branches/cmake/teraterm/ttpmacro/ttmmain.cpp
===================================================================
--- branches/cmake/teraterm/ttpmacro/ttmmain.cpp 2019-05-19 15:04:19 UTC (rev 7692)
+++ branches/cmake/teraterm/ttpmacro/ttmmain.cpp 2019-05-19 15:04:55 UTC (rev 7693)
@@ -39,7 +39,6 @@
#include "ttl.h"
#include "ttmparse.h"
#include "ttmdde.h"
-
#include "ttmmain.h"
#include "ttmbuff.h"
#include "ttmlib.h"
@@ -46,8 +45,9 @@
#include "dlglib.h"
#include "ttlib.h"
-
#include "wait4all.h"
+#include "tmfc.h"
+#include "ttmacro.h"
#include "tmfc.h"
#include "codeconv.h"
@@ -465,7 +465,7 @@
if (::IsIconic(m_hWnd)) {
int OldMapMode = GetMapMode(dc);
SetMapMode(dc, MM_TEXT);
- SendMessage(WM_ICONERASEBKGND,(WPARAM)dc, 0);
+ SendMessage(WM_ICONERASEBKGND,(WPARAM)dc, 0); // TODO
DrawIcon(dc, 0, 0, m_hIcon);
SetMapMode(dc, OldMapMode);
}
Modified: branches/cmake/teraterm/ttpmacro/ttmparse.c
===================================================================
--- branches/cmake/teraterm/ttpmacro/ttmparse.c 2019-05-19 15:04:19 UTC (rev 7692)
+++ branches/cmake/teraterm/ttpmacro/ttmparse.c 2019-05-19 15:04:55 UTC (rev 7693)
@@ -47,6 +47,12 @@
#define free(p) _free_dbg((p), _NORMAL_BLOCK, __FILE__, __LINE__)
#endif
+#ifdef _DEBUG
+#define calloc(c, s) _calloc_dbg((c), (s), _NORMAL_BLOCK, __FILE__, __LINE__)
+#define malloc(l) _malloc_dbg((l), _NORMAL_BLOCK, __FILE__, __LINE__)
+#define free(p) _free_dbg((p), _NORMAL_BLOCK)
+#endif
+
/* 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/cmake/teraterm/ttpmacro/ttpmacro.dsp
===================================================================
--- branches/cmake/teraterm/ttpmacro/ttpmacro.dsp 2019-05-19 15:04:19 UTC (rev 7692)
+++ branches/cmake/teraterm/ttpmacro/ttpmacro.dsp 2019-05-19 15:04:55 UTC (rev 7693)
@@ -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/cmake/teraterm/ttpmacro/ttpmacro.v15.vcxproj
===================================================================
--- branches/cmake/teraterm/ttpmacro/ttpmacro.v15.vcxproj 2019-05-19 15:04:19 UTC (rev 7692)
+++ branches/cmake/teraterm/ttpmacro/ttpmacro.v15.vcxproj 2019-05-19 15:04:55 UTC (rev 7693)
@@ -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">
@@ -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,12 +124,19 @@
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<TargetMachine>MachineX86</TargetMachine>
- <IgnoreSpecificDefaultLibraries>nafxcwd.lib;LIBCMTD.lib;libcmt.lib</IgnoreSpecificDefaultLibraries>
+ <IgnoreSpecificDefaultLibraries>libcmt.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" />
@@ -152,6 +158,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" />
@@ -161,7 +171,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/cmake/teraterm/ttpmacro/ttpmacro.v15.vcxproj.filters
===================================================================
--- branches/cmake/teraterm/ttpmacro/ttpmacro.v15.vcxproj.filters 2019-05-19 15:04:19 UTC (rev 7692)
+++ branches/cmake/teraterm/ttpmacro/ttpmacro.v15.vcxproj.filters 2019-05-19 15:04:55 UTC (rev 7693)
@@ -79,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">
@@ -96,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>
@@ -147,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">
Modified: branches/cmake/teraterm/ttpmacro/ttpmacro.vcproj
===================================================================
--- branches/cmake/teraterm/ttpmacro/ttpmacro.vcproj 2019-05-19 15:04:19 UTC (rev 7692)
+++ branches/cmake/teraterm/ttpmacro/ttpmacro.vcproj 2019-05-19 15:04:55 UTC (rev 7693)
@@ -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,6 +250,14 @@
>
</File>
<File
+ RelativePath="..\common\tmfc.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\common\tmfc_frame.cpp"
+ >
+ </File>
+ <File
RelativePath="ttmacro.cpp"
>
</File>
@@ -252,6 +279,14 @@
>
</File>
<File
+ RelativePath="..\common\compat_win.h"
+ >
+ </File>
+ <File
+ RelativePath="..\common\dllutil.h"
+ >
+ </File>
+ <File
RelativePath="errdlg.h"
>
</File>
@@ -280,6 +315,10 @@
>
</File>
<File
+ RelativePath="..\common\tmfc.h"
+ >
+ </File>
+ <File
RelativePath="..\common\ttddecmnd.h"
>
</File>
@@ -380,6 +419,10 @@
Filter="c"
>
<File
+ RelativePath="fileread.cpp"
+ >
+ </File>
+ <File
RelativePath="..\common\i18n.c"
>
</File>
@@ -419,10 +462,6 @@
RelativePath="..\common\win16api.c"
>
</File>
- <File
- RelativePath="fileread.cpp"
- >
- </File>
</Filter>
</Files>
<Globals>
Deleted: branches/cmake/teraterm/ttpset/ttpset.dsp
===================================================================
--- branches/cmake/teraterm/ttpset/ttpset.dsp 2019-05-19 15:04:19 UTC (rev 7692)
+++ branches/cmake/teraterm/ttpset/ttpset.dsp 2019-05-19 15:04:55 UTC (rev 7693)
@@ -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
Modified: branches/cmake/teraterm/ttpset/ttpset.vcproj
===================================================================
--- branches/cmake/teraterm/ttpset/ttpset.vcproj 2019-05-19 15:04:19 UTC (rev 7692)
+++ branches/cmake/teraterm/ttpset/ttpset.vcproj 2019-05-19 15:04:55 UTC (rev 7693)
@@ -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)"
Deleted: branches/cmake/teraterm/ttptek/ttptek.dsp
===================================================================
--- branches/cmake/teraterm/ttptek/ttptek.dsp 2019-05-19 15:04:19 UTC (rev 7692)
+++ branches/cmake/teraterm/ttptek/ttptek.dsp 2019-05-19 15:04:55 UTC (rev 7693)
@@ -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
Modified: branches/cmake/teraterm/ttptek/ttptek.vcproj
===================================================================
--- branches/cmake/teraterm/ttptek/ttptek.vcproj 2019-05-19 15:04:19 UTC (rev 7692)
+++ branches/cmake/teraterm/ttptek/ttptek.vcproj 2019-05-19 15:04:55 UTC (rev 7693)
@@ -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)"
Modified: branches/cmake/tests/gui_commands_test.ttl
===================================================================
--- branches/cmake/tests/gui_commands_test.ttl 2019-05-19 15:04:19 UTC (rev 7692)
+++ branches/cmake/tests/gui_commands_test.ttl 2019-05-19 15:04:55 UTC (rev 7693)
@@ -95,7 +95,7 @@
;;; messagebox
:test_statusbox
call test_statusbox_centerwindow
-;call test_statusbox_setdlgpos
+call test_statusbox_setdlgpos
return
; 表示されていない→表示する 時 センタリングされる
Deleted: branches/cmake/ttpmenu/ttpmenu.dsp
===================================================================
--- branches/cmake/ttpmenu/ttpmenu.dsp 2019-05-19 15:04:19 UTC (rev 7692)
+++ branches/cmake/ttpmenu/ttpmenu.dsp 2019-05-19 15:04:55 UTC (rev 7693)
@@ -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/cmake/ttpmenu/ttpmenu.dsw
===================================================================
--- branches/cmake/ttpmenu/ttpmenu.dsw 2019-05-19 15:04:19 UTC (rev 7692)
+++ branches/cmake/ttpmenu/ttpmenu.dsw 2019-05-19 15:04:55 UTC (rev 7693)
@@ -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/cmake/ttpmenu/ttpmenu.rc
===================================================================
--- branches/cmake/ttpmenu/ttpmenu.rc 2019-05-19 15:04:19 UTC (rev 7692)
+++ branches/cmake/ttpmenu/ttpmenu.rc 2019-05-19 15:04:55 UTC (rev 7693)
@@ -7,7 +7,6 @@
//
// Generated from the TEXTINCLUDE 2 resource.
//
-//#include "afxres.h"
#include <windows.h>
/////////////////////////////////////////////////////////////////////////////
Deleted: branches/cmake/ttssh2/matcher/matcher.dsp
===================================================================
--- branches/cmake/ttssh2/matcher/matcher.dsp 2019-05-19 15:04:19 UTC (rev 7692)
+++ branches/cmake/ttssh2/matcher/matcher.dsp 2019-05-19 15:04:55 UTC (rev 7693)
@@ -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
Deleted: branches/cmake/ttssh2/ttssh/ttssh.dsp
===================================================================
--- branches/cmake/ttssh2/ttssh/ttssh.dsp 2019-05-19 15:04:19 UTC (rev 7692)
+++ branches/cmake/ttssh2/ttssh/ttssh.dsp 2019-05-19 15:04:55 UTC (rev 7693)
@@ -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/cmake/ttssh2/ttssh/ttssh.rc
===================================================================
--- branches/cmake/ttssh2/ttssh/ttssh.rc 2019-05-19 15:04:19 UTC (rev 7692)
+++ branches/cmake/ttssh2/ttssh/ttssh.rc 2019-05-19 15:04:55 UTC (rev 7693)
@@ -8,6 +8,7 @@
// Generated from the TEXTINCLUDE 2 resource.
//
//#include "afxres.h"
+#include <windows.h>
/////////////////////////////////////////////////////////////////////////////
#undef APSTUDIO_READONLY_SYMBOLS
Deleted: branches/cmake/ttssh2/ttssh.dsw
===================================================================
--- branches/cmake/ttssh2/ttssh.dsw 2019-05-19 15:04:19 UTC (rev 7692)
+++ branches/cmake/ttssh2/ttssh.dsw 2019-05-19 15:04:55 UTC (rev 7693)
@@ -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/cmake/ttssh2/ttssh.opt
===================================================================
(Binary files differ)
Modified: branches/cmake/ttssh2/ttxssh/keyfiles.c
===================================================================
--- branches/cmake/ttssh2/ttxssh/keyfiles.c 2019-05-19 15:04:19 UTC (rev 7692)
+++ branches/cmake/ttssh2/ttxssh/keyfiles.c 2019-05-19 15:04:55 UTC (rev 7693)
@@ -50,10 +50,6 @@
#include "cipher.h"
-#if defined(__MINGW32__)
-#define __FUNCTION__
-#endif
-
static char ID_string[] = "SSH PRIVATE KEY FILE FORMAT 1.1\n";
static BIGNUM *get_bignum(unsigned char *bytes)
@@ -392,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))
@@ -405,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;
@@ -424,7 +420,7 @@
}
}
if (!len) {
- logprintf(LOG_LEVEL_VERBOSE, __FUNCTION__ ": no end marker");
+ logprintf(LOG_LEVEL_VERBOSE, "%s: no end marker", __FUNCTION__);
goto error;
}
@@ -431,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;
}
@@ -446,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));
@@ -471,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;
}
@@ -482,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);
@@ -495,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;
}
@@ -506,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 */
@@ -516,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;
}
@@ -531,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);
@@ -538,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;
}
}
@@ -555,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;
}
@@ -563,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;
}
@@ -583,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/cmake/ttssh2/ttxssh/ssh.c
===================================================================
--- branches/cmake/ttssh2/ttxssh/ssh.c 2019-05-19 15:04:19 UTC (rev 7692)
+++ branches/cmake/ttssh2/ttxssh/ssh.c 2019-05-19 15:04:55 UTC (rev 7693)
@@ -5962,7 +5962,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,
- __FUNCTION__ ": type mismatch for decoded server_host_key_blob (kex:%s blob:%s)",
+ "%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;
@@ -6105,7 +6105,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,
- __FUNCTION__ ": type mismatch for decoded server_host_key_blob (kex:%s blob:%s)",
+ "%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;
@@ -6254,7 +6254,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,
- __FUNCTION__ ": type mismatch for decoded server_host_key_blob (kex:%s blob:%s)",
+ "%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;
Deleted: branches/cmake/ttssh2/ttxssh/ttxssh.dsp
===================================================================
--- branches/cmake/ttssh2/ttxssh/ttxssh.dsp 2019-05-19 15:04:19 UTC (rev 7692)
+++ branches/cmake/ttssh2/ttxssh/ttxssh.dsp 2019-05-19 15:04:55 UTC (rev 7693)
@@ -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/cmake/ttssh2/ttxssh/ttxssh.rc
===================================================================
--- branches/cmake/ttssh2/ttxssh/ttxssh.rc 2019-05-19 15:04:19 UTC (rev 7692)
+++ branches/cmake/ttssh2/ttxssh/ttxssh.rc 2019-05-19 15:04:55 UTC (rev 7693)
@@ -7,7 +7,6 @@
//
// Generated from the TEXTINCLUDE 2 resource.
//
-//#include "afxres.h"
#include <windows.h>
#ifndef IDC_STATIC
#define IDC_STATIC -1