svnno****@sourc*****
svnno****@sourc*****
2016年 2月 2日 (火) 00:14:14 JST
Tera TermRevision: 6286
http://sourceforge.jp/projects/ttssh2/scm/svn/commits/6286
Author: yutakapon
Date: 2016-02-02 00:14:14 +0900 (Tue, 02 Feb 2016)
Log Message:
-----------
チケット #35744 VS2015の警告除去
下記ブランチからマージした。
svn+ssh://yutak****@svn*****/svnroot/ttssh2/branches/vs2015_warn
リビジョン6194 - 6260
Ticket Links:
------------
http://sourceforge.jp/projects/ttssh2/tracker/detail/35744
Modified Paths:
--------------
trunk/TTProxy/StdAfx.h
trunk/TTProxy/TTProxy.v11.vcxproj
trunk/TTProxy/TTProxy.v12.vcxproj
trunk/TTProxy/TTProxy.v14.vcxproj
trunk/TTXKanjiMenu/ttxkanjimenu.c
trunk/TTXKanjiMenu/ttxkanjimenu.v11.vcxproj
trunk/TTXKanjiMenu/ttxkanjimenu.v12.vcxproj
trunk/TTXKanjiMenu/ttxkanjimenu.v14.vcxproj
trunk/TTXSamples/TTXAdditionalTitle/TTXAdditionalTitle.v11.vcxproj
trunk/TTXSamples/TTXAdditionalTitle/TTXAdditionalTitle.v12.vcxproj
trunk/TTXSamples/TTXAdditionalTitle/TTXAdditionalTitle.v14.vcxproj
trunk/TTXSamples/TTXAlwaysOnTop/TTXAlwaysOnTop.v11.vcxproj
trunk/TTXSamples/TTXAlwaysOnTop/TTXAlwaysOnTop.v12.vcxproj
trunk/TTXSamples/TTXAlwaysOnTop/TTXAlwaysOnTop.v14.vcxproj
trunk/TTXSamples/TTXCallSysMenu/TTXCallSysMenu.v11.vcxproj
trunk/TTXSamples/TTXCallSysMenu/TTXCallSysMenu.v12.vcxproj
trunk/TTXSamples/TTXCallSysMenu/TTXCallSysMenu.v14.vcxproj
trunk/TTXSamples/TTXCommandLineOpt/TTXCommandLineOpt.v11.vcxproj
trunk/TTXSamples/TTXCommandLineOpt/TTXCommandLineOpt.v12.vcxproj
trunk/TTXSamples/TTXCommandLineOpt/TTXCommandLineOpt.v14.vcxproj
trunk/TTXSamples/TTXCopyIniFile/TTXCopyIniFile.v11.vcxproj
trunk/TTXSamples/TTXCopyIniFile/TTXCopyIniFile.v12.vcxproj
trunk/TTXSamples/TTXCopyIniFile/TTXCopyIniFile.v14.vcxproj
trunk/TTXSamples/TTXFixedWinSize/TTXFixedWinSize.v11.vcxproj
trunk/TTXSamples/TTXFixedWinSize/TTXFixedWinSize.v12.vcxproj
trunk/TTXSamples/TTXFixedWinSize/TTXFixedWinSize.v14.vcxproj
trunk/TTXSamples/TTXKcodeChange/TTXKcodeChange.v11.vcxproj
trunk/TTXSamples/TTXKcodeChange/TTXKcodeChange.v12.vcxproj
trunk/TTXSamples/TTXKcodeChange/TTXKcodeChange.v14.vcxproj
trunk/TTXSamples/TTXOutputBuffering/TTXOutputBuffering.v11.vcxproj
trunk/TTXSamples/TTXOutputBuffering/TTXOutputBuffering.v12.vcxproj
trunk/TTXSamples/TTXOutputBuffering/TTXOutputBuffering.v14.vcxproj
trunk/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.v11.vcxproj
trunk/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.v12.vcxproj
trunk/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.v14.vcxproj
trunk/TTXSamples/TTXResizeMenu/TTXResizeMenu.c
trunk/TTXSamples/TTXResizeMenu/TTXResizeMenu.v10.vcxproj
trunk/TTXSamples/TTXResizeMenu/TTXResizeMenu.v11.vcxproj
trunk/TTXSamples/TTXResizeMenu/TTXResizeMenu.v12.vcxproj
trunk/TTXSamples/TTXResizeMenu/TTXResizeMenu.v14.vcxproj
trunk/TTXSamples/TTXResizeMenu/TTXResizeMenu.v9.vcproj
trunk/TTXSamples/TTXResizeMenu/TTXResizeMenu.vcproj
trunk/TTXSamples/TTXResizeWin/TTXResizeWin.v11.vcxproj
trunk/TTXSamples/TTXResizeWin/TTXResizeWin.v12.vcxproj
trunk/TTXSamples/TTXResizeWin/TTXResizeWin.v14.vcxproj
trunk/TTXSamples/TTXShowCommandLine/TTXShowCommandLine.v11.vcxproj
trunk/TTXSamples/TTXShowCommandLine/TTXShowCommandLine.v12.vcxproj
trunk/TTXSamples/TTXShowCommandLine/TTXShowCommandLine.v14.vcxproj
trunk/TTXSamples/TTXViewMode/TTXViewMode.v11.vcxproj
trunk/TTXSamples/TTXViewMode/TTXViewMode.v12.vcxproj
trunk/TTXSamples/TTXViewMode/TTXViewMode.v14.vcxproj
trunk/TTXSamples/TTXttyrec/TTXttyplay.v11.vcxproj
trunk/TTXSamples/TTXttyrec/TTXttyplay.v12.vcxproj
trunk/TTXSamples/TTXttyrec/TTXttyplay.v14.vcxproj
trunk/TTXSamples/TTXttyrec/TTXttyrec.v11.vcxproj
trunk/TTXSamples/TTXttyrec/TTXttyrec.v12.vcxproj
trunk/TTXSamples/TTXttyrec/TTXttyrec.v14.vcxproj
trunk/TTXSamples/ttxtest/TTXtest.v11.vcxproj
trunk/TTXSamples/ttxtest/TTXtest.v12.vcxproj
trunk/TTXSamples/ttxtest/TTXtest.v14.vcxproj
trunk/teraterm/common/teraterm.h
trunk/teraterm/common/ttlib.c
trunk/teraterm/common/ttlib.h
trunk/teraterm/svnrev/svnrev.v14.vcxproj
trunk/teraterm/teraterm/clipboar.c
trunk/teraterm/teraterm/commlib.c
trunk/teraterm/teraterm/ftdlg.cpp
trunk/teraterm/teraterm/keyboard.c
trunk/teraterm/teraterm/tekwin.cpp
trunk/teraterm/teraterm/teraterm.manifest
trunk/teraterm/teraterm/vtdisp.c
trunk/teraterm/teraterm/vtwin.cpp
trunk/teraterm/teraterm/winjump.c
trunk/teraterm/ttpcmn/ttcmn.c
trunk/teraterm/ttpcmn/ttpcmn.def
trunk/teraterm/ttpdlg/ttdlg.c
trunk/teraterm/ttpfile/kermit.c
trunk/teraterm/ttpmacro/ttl.c
trunk/teraterm/ttpmacro/ttmbuff.c
trunk/teraterm/ttpmacro/ttmlib.c
trunk/teraterm/ttpmacro/ttmmain.cpp
trunk/teraterm/ttpset/ttset.c
trunk/ttpmenu/ttpmenu.cpp
trunk/ttssh2/matcher/matcher.v11.vcxproj
trunk/ttssh2/matcher/matcher.v12.vcxproj
trunk/ttssh2/matcher/matcher.v14.vcxproj
trunk/ttssh2/puttyrev/puttyrev.v11.vcxproj
trunk/ttssh2/puttyrev/puttyrev.v12.vcxproj
trunk/ttssh2/puttyrev/puttyrev.v14.vcxproj
trunk/ttssh2/ttssh/ttssh.v11.vcxproj
trunk/ttssh2/ttssh/ttssh.v12.vcxproj
trunk/ttssh2/ttssh/ttssh.v14.vcxproj
trunk/ttssh2/ttxssh/dns.c
trunk/ttssh2/ttxssh/ed25519_bcrypt_pbkdf.c
trunk/ttssh2/ttxssh/key.c
trunk/ttssh2/ttxssh/ttxssh.c
trunk/ttssh2/ttxssh/ttxssh.h
trunk/ttssh2/ttxssh/ttxssh.v11.vcxproj
trunk/ttssh2/ttxssh/ttxssh.v12.vcxproj
trunk/ttssh2/ttxssh/ttxssh.v14.vcxproj
Property Changed:
----------------
trunk/
trunk/TTProxy/
trunk/TTXKanjiMenu/
trunk/TTXSamples/
trunk/teraterm/
trunk/ttpmenu/
-------------- next part --------------
Property changes on: trunk
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/ssh_ed25519:5495-5544
+ /branches/ssh_ed25519:5495-5544
/branches/vs2015_warn:6194-6285
/tags/teraterm-4_89:6182
Property changes on: trunk/TTProxy
___________________________________________________________________
Modified: svn:mergeinfo
-
+ /branches/vs2015_warn/TTProxy:6194-6285
Modified: trunk/TTProxy/StdAfx.h
===================================================================
--- trunk/TTProxy/StdAfx.h 2016-01-31 14:31:30 UTC (rev 6285)
+++ trunk/TTProxy/StdAfx.h 2016-02-01 15:14:14 UTC (rev 6286)
@@ -12,6 +12,16 @@
#define _WINSOCKAPI_
+/* VS2015(VC14.0)\x82\xBE\x82ƁAWSASocketA(), inet_ntoa() \x82Ȃǂ\xCCAPI\x82\xAAdeprecated\x82ł\xA0\x82\xE9\x82\xC6
+* \x8Cx\x8D\x90\x82\xB7\x82邽\x82߂ɁA\x8Cx\x8D\x90\x82\xF0\x97}\x8E~\x82\xB7\x82\xE9\x81B\x91\xE3\x91֊\x94\x82ɒu\x8A\xB7\x82\xB7\x82\xE9\x82ƁAVS2005(VC8.0)\x82Ńr\x83\x8B\x83h
+* \x82ł\xAB\x82Ȃ\xAD\x82Ȃ邽\x82߁A\x8Cx\x8D\x90\x82\xF0\x97}\x8E~\x82\xB7\x82邾\x82\xAF\x82Ƃ\xB7\x82\xE9\x81B
+*/
+#if _MSC_VER >= 1800 // VSC2013(VC12.0) or later
+#ifndef _WINSOCK_DEPRECATED_NO_WARNINGS
+#define _WINSOCK_DEPRECATED_NO_WARNINGS
+#endif
+#endif
+
// \x82\xB1\x82̈ʒu\x82Ƀw\x83b\x83_\x81[\x82\xF0\x91}\x93\xFC\x82\xB5\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2
#include <winsock2.h>
Modified: trunk/TTProxy/TTProxy.v11.vcxproj
===================================================================
--- trunk/TTProxy/TTProxy.v11.vcxproj 2016-01-31 14:31:30 UTC (rev 6285)
+++ trunk/TTProxy/TTProxy.v11.vcxproj 2016-02-01 15:14:14 UTC (rev 6286)
@@ -90,6 +90,7 @@
<GenerateMapFile>true</GenerateMapFile>
<ImportLibrary>$(OutDir)$(ProjectName).lib</ImportLibrary>
<TargetMachine>MachineX86</TargetMachine>
+ <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
</Link>
<Bscmake>
<SuppressStartupBanner>true</SuppressStartupBanner>
Modified: trunk/TTProxy/TTProxy.v12.vcxproj
===================================================================
--- trunk/TTProxy/TTProxy.v12.vcxproj 2016-01-31 14:31:30 UTC (rev 6285)
+++ trunk/TTProxy/TTProxy.v12.vcxproj 2016-02-01 15:14:14 UTC (rev 6286)
@@ -90,6 +90,7 @@
<GenerateMapFile>true</GenerateMapFile>
<ImportLibrary>$(OutDir)$(ProjectName).lib</ImportLibrary>
<TargetMachine>MachineX86</TargetMachine>
+ <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
</Link>
<Bscmake>
<SuppressStartupBanner>true</SuppressStartupBanner>
Modified: trunk/TTProxy/TTProxy.v14.vcxproj
===================================================================
--- trunk/TTProxy/TTProxy.v14.vcxproj 2016-01-31 14:31:30 UTC (rev 6285)
+++ trunk/TTProxy/TTProxy.v14.vcxproj 2016-02-01 15:14:14 UTC (rev 6286)
@@ -129,6 +129,7 @@
<GenerateDebugInformation>true</GenerateDebugInformation>
<ImportLibrary>$(OutDir)$(ProjectName).lib</ImportLibrary>
<TargetMachine>MachineX86</TargetMachine>
+ <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
</Link>
<Bscmake>
<SuppressStartupBanner>true</SuppressStartupBanner>
Property changes on: trunk/TTXKanjiMenu
___________________________________________________________________
Modified: svn:mergeinfo
-
+ /branches/vs2015_warn/TTXKanjiMenu:6194-6285
Modified: trunk/TTXKanjiMenu/ttxkanjimenu.c
===================================================================
--- trunk/TTXKanjiMenu/ttxkanjimenu.c 2016-01-31 14:31:30 UTC (rev 6285)
+++ trunk/TTXKanjiMenu/ttxkanjimenu.c 2016-02-01 15:14:14 UTC (rev 6286)
@@ -283,15 +283,12 @@
}
{
- OSVERSIONINFO osvi;
MENUITEMINFO mi;
pvar->hmEncode = CreateMenu();
// Windows 95 \x82Ń\x81\x83j\x83\x85\x81[\x82\xAA\x95\\x8E\xA6\x82\xB3\x82\xEA\x82Ȃ\xA2\x82̂Ńo\x81[\x83W\x83\x87\x83\x93\x83`\x83F\x83b\x83N\x82\xF0\x93\xFC\x82\xEA\x82\xE9 (2009.2.18 maya)
- osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
- GetVersionEx(&osvi);
- if (osvi.dwMajorVersion >= 5) {
+ if (IsWindows2000OrLater()) {
memset(&mi, 0, sizeof(MENUITEMINFO));
mi.cbSize = sizeof(MENUITEMINFO);
}
Modified: trunk/TTXKanjiMenu/ttxkanjimenu.v11.vcxproj
===================================================================
--- trunk/TTXKanjiMenu/ttxkanjimenu.v11.vcxproj 2016-01-31 14:31:30 UTC (rev 6285)
+++ trunk/TTXKanjiMenu/ttxkanjimenu.v11.vcxproj 2016-02-01 15:14:14 UTC (rev 6286)
@@ -68,6 +68,7 @@
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<TargetMachine>MachineX86</TargetMachine>
+ <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
Modified: trunk/TTXKanjiMenu/ttxkanjimenu.v12.vcxproj
===================================================================
--- trunk/TTXKanjiMenu/ttxkanjimenu.v12.vcxproj 2016-01-31 14:31:30 UTC (rev 6285)
+++ trunk/TTXKanjiMenu/ttxkanjimenu.v12.vcxproj 2016-02-01 15:14:14 UTC (rev 6286)
@@ -68,6 +68,7 @@
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<TargetMachine>MachineX86</TargetMachine>
+ <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
Modified: trunk/TTXKanjiMenu/ttxkanjimenu.v14.vcxproj
===================================================================
--- trunk/TTXKanjiMenu/ttxkanjimenu.v14.vcxproj 2016-01-31 14:31:30 UTC (rev 6285)
+++ trunk/TTXKanjiMenu/ttxkanjimenu.v14.vcxproj 2016-02-01 15:14:14 UTC (rev 6286)
@@ -68,6 +68,7 @@
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<TargetMachine>MachineX86</TargetMachine>
+ <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
Property changes on: trunk/TTXSamples
___________________________________________________________________
Modified: svn:mergeinfo
-
+ /branches/vs2015_warn/TTXSamples:6194-6285
Modified: trunk/TTXSamples/TTXAdditionalTitle/TTXAdditionalTitle.v11.vcxproj
===================================================================
--- trunk/TTXSamples/TTXAdditionalTitle/TTXAdditionalTitle.v11.vcxproj 2016-01-31 14:31:30 UTC (rev 6285)
+++ trunk/TTXSamples/TTXAdditionalTitle/TTXAdditionalTitle.v11.vcxproj 2016-02-01 15:14:14 UTC (rev 6286)
@@ -68,6 +68,7 @@
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<TargetMachine>MachineX86</TargetMachine>
+ <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
Modified: trunk/TTXSamples/TTXAdditionalTitle/TTXAdditionalTitle.v12.vcxproj
===================================================================
--- trunk/TTXSamples/TTXAdditionalTitle/TTXAdditionalTitle.v12.vcxproj 2016-01-31 14:31:30 UTC (rev 6285)
+++ trunk/TTXSamples/TTXAdditionalTitle/TTXAdditionalTitle.v12.vcxproj 2016-02-01 15:14:14 UTC (rev 6286)
@@ -68,6 +68,7 @@
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<TargetMachine>MachineX86</TargetMachine>
+ <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
Modified: trunk/TTXSamples/TTXAdditionalTitle/TTXAdditionalTitle.v14.vcxproj
===================================================================
--- trunk/TTXSamples/TTXAdditionalTitle/TTXAdditionalTitle.v14.vcxproj 2016-01-31 14:31:30 UTC (rev 6285)
+++ trunk/TTXSamples/TTXAdditionalTitle/TTXAdditionalTitle.v14.vcxproj 2016-02-01 15:14:14 UTC (rev 6286)
@@ -68,6 +68,7 @@
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<TargetMachine>MachineX86</TargetMachine>
+ <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
Modified: trunk/TTXSamples/TTXAlwaysOnTop/TTXAlwaysOnTop.v11.vcxproj
===================================================================
--- trunk/TTXSamples/TTXAlwaysOnTop/TTXAlwaysOnTop.v11.vcxproj 2016-01-31 14:31:30 UTC (rev 6285)
+++ trunk/TTXSamples/TTXAlwaysOnTop/TTXAlwaysOnTop.v11.vcxproj 2016-02-01 15:14:14 UTC (rev 6286)
@@ -68,6 +68,7 @@
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<TargetMachine>MachineX86</TargetMachine>
+ <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
Modified: trunk/TTXSamples/TTXAlwaysOnTop/TTXAlwaysOnTop.v12.vcxproj
===================================================================
--- trunk/TTXSamples/TTXAlwaysOnTop/TTXAlwaysOnTop.v12.vcxproj 2016-01-31 14:31:30 UTC (rev 6285)
+++ trunk/TTXSamples/TTXAlwaysOnTop/TTXAlwaysOnTop.v12.vcxproj 2016-02-01 15:14:14 UTC (rev 6286)
@@ -68,6 +68,7 @@
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<TargetMachine>MachineX86</TargetMachine>
+ <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
Modified: trunk/TTXSamples/TTXAlwaysOnTop/TTXAlwaysOnTop.v14.vcxproj
===================================================================
--- trunk/TTXSamples/TTXAlwaysOnTop/TTXAlwaysOnTop.v14.vcxproj 2016-01-31 14:31:30 UTC (rev 6285)
+++ trunk/TTXSamples/TTXAlwaysOnTop/TTXAlwaysOnTop.v14.vcxproj 2016-02-01 15:14:14 UTC (rev 6286)
@@ -68,6 +68,7 @@
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<TargetMachine>MachineX86</TargetMachine>
+ <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
Modified: trunk/TTXSamples/TTXCallSysMenu/TTXCallSysMenu.v11.vcxproj
===================================================================
--- trunk/TTXSamples/TTXCallSysMenu/TTXCallSysMenu.v11.vcxproj 2016-01-31 14:31:30 UTC (rev 6285)
+++ trunk/TTXSamples/TTXCallSysMenu/TTXCallSysMenu.v11.vcxproj 2016-02-01 15:14:14 UTC (rev 6286)
@@ -67,6 +67,7 @@
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<TargetMachine>MachineX86</TargetMachine>
+ <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
Modified: trunk/TTXSamples/TTXCallSysMenu/TTXCallSysMenu.v12.vcxproj
===================================================================
--- trunk/TTXSamples/TTXCallSysMenu/TTXCallSysMenu.v12.vcxproj 2016-01-31 14:31:30 UTC (rev 6285)
+++ trunk/TTXSamples/TTXCallSysMenu/TTXCallSysMenu.v12.vcxproj 2016-02-01 15:14:14 UTC (rev 6286)
@@ -67,6 +67,7 @@
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<TargetMachine>MachineX86</TargetMachine>
+ <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
Modified: trunk/TTXSamples/TTXCallSysMenu/TTXCallSysMenu.v14.vcxproj
===================================================================
--- trunk/TTXSamples/TTXCallSysMenu/TTXCallSysMenu.v14.vcxproj 2016-01-31 14:31:30 UTC (rev 6285)
+++ trunk/TTXSamples/TTXCallSysMenu/TTXCallSysMenu.v14.vcxproj 2016-02-01 15:14:14 UTC (rev 6286)
@@ -67,6 +67,7 @@
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<TargetMachine>MachineX86</TargetMachine>
+ <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
Modified: trunk/TTXSamples/TTXCommandLineOpt/TTXCommandLineOpt.v11.vcxproj
===================================================================
--- trunk/TTXSamples/TTXCommandLineOpt/TTXCommandLineOpt.v11.vcxproj 2016-01-31 14:31:30 UTC (rev 6285)
+++ trunk/TTXSamples/TTXCommandLineOpt/TTXCommandLineOpt.v11.vcxproj 2016-02-01 15:14:14 UTC (rev 6286)
@@ -68,6 +68,7 @@
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<TargetMachine>MachineX86</TargetMachine>
+ <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
Modified: trunk/TTXSamples/TTXCommandLineOpt/TTXCommandLineOpt.v12.vcxproj
===================================================================
--- trunk/TTXSamples/TTXCommandLineOpt/TTXCommandLineOpt.v12.vcxproj 2016-01-31 14:31:30 UTC (rev 6285)
+++ trunk/TTXSamples/TTXCommandLineOpt/TTXCommandLineOpt.v12.vcxproj 2016-02-01 15:14:14 UTC (rev 6286)
@@ -68,6 +68,7 @@
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<TargetMachine>MachineX86</TargetMachine>
+ <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
Modified: trunk/TTXSamples/TTXCommandLineOpt/TTXCommandLineOpt.v14.vcxproj
===================================================================
--- trunk/TTXSamples/TTXCommandLineOpt/TTXCommandLineOpt.v14.vcxproj 2016-01-31 14:31:30 UTC (rev 6285)
+++ trunk/TTXSamples/TTXCommandLineOpt/TTXCommandLineOpt.v14.vcxproj 2016-02-01 15:14:14 UTC (rev 6286)
@@ -68,6 +68,7 @@
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<TargetMachine>MachineX86</TargetMachine>
+ <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
Modified: trunk/TTXSamples/TTXCopyIniFile/TTXCopyIniFile.v11.vcxproj
===================================================================
--- trunk/TTXSamples/TTXCopyIniFile/TTXCopyIniFile.v11.vcxproj 2016-01-31 14:31:30 UTC (rev 6285)
+++ trunk/TTXSamples/TTXCopyIniFile/TTXCopyIniFile.v11.vcxproj 2016-02-01 15:14:14 UTC (rev 6286)
@@ -67,6 +67,7 @@
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<TargetMachine>MachineX86</TargetMachine>
+ <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
Modified: trunk/TTXSamples/TTXCopyIniFile/TTXCopyIniFile.v12.vcxproj
===================================================================
--- trunk/TTXSamples/TTXCopyIniFile/TTXCopyIniFile.v12.vcxproj 2016-01-31 14:31:30 UTC (rev 6285)
+++ trunk/TTXSamples/TTXCopyIniFile/TTXCopyIniFile.v12.vcxproj 2016-02-01 15:14:14 UTC (rev 6286)
@@ -67,6 +67,7 @@
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<TargetMachine>MachineX86</TargetMachine>
+ <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
Modified: trunk/TTXSamples/TTXCopyIniFile/TTXCopyIniFile.v14.vcxproj
===================================================================
--- trunk/TTXSamples/TTXCopyIniFile/TTXCopyIniFile.v14.vcxproj 2016-01-31 14:31:30 UTC (rev 6285)
+++ trunk/TTXSamples/TTXCopyIniFile/TTXCopyIniFile.v14.vcxproj 2016-02-01 15:14:14 UTC (rev 6286)
@@ -67,6 +67,7 @@
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<TargetMachine>MachineX86</TargetMachine>
+ <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
Modified: trunk/TTXSamples/TTXFixedWinSize/TTXFixedWinSize.v11.vcxproj
===================================================================
--- trunk/TTXSamples/TTXFixedWinSize/TTXFixedWinSize.v11.vcxproj 2016-01-31 14:31:30 UTC (rev 6285)
+++ trunk/TTXSamples/TTXFixedWinSize/TTXFixedWinSize.v11.vcxproj 2016-02-01 15:14:14 UTC (rev 6286)
@@ -67,6 +67,7 @@
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<TargetMachine>MachineX86</TargetMachine>
+ <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
Modified: trunk/TTXSamples/TTXFixedWinSize/TTXFixedWinSize.v12.vcxproj
===================================================================
--- trunk/TTXSamples/TTXFixedWinSize/TTXFixedWinSize.v12.vcxproj 2016-01-31 14:31:30 UTC (rev 6285)
+++ trunk/TTXSamples/TTXFixedWinSize/TTXFixedWinSize.v12.vcxproj 2016-02-01 15:14:14 UTC (rev 6286)
@@ -67,6 +67,7 @@
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<TargetMachine>MachineX86</TargetMachine>
+ <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
Modified: trunk/TTXSamples/TTXFixedWinSize/TTXFixedWinSize.v14.vcxproj
===================================================================
--- trunk/TTXSamples/TTXFixedWinSize/TTXFixedWinSize.v14.vcxproj 2016-01-31 14:31:30 UTC (rev 6285)
+++ trunk/TTXSamples/TTXFixedWinSize/TTXFixedWinSize.v14.vcxproj 2016-02-01 15:14:14 UTC (rev 6286)
@@ -67,6 +67,7 @@
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<TargetMachine>MachineX86</TargetMachine>
+ <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
Modified: trunk/TTXSamples/TTXKcodeChange/TTXKcodeChange.v11.vcxproj
===================================================================
--- trunk/TTXSamples/TTXKcodeChange/TTXKcodeChange.v11.vcxproj 2016-01-31 14:31:30 UTC (rev 6285)
+++ trunk/TTXSamples/TTXKcodeChange/TTXKcodeChange.v11.vcxproj 2016-02-01 15:14:14 UTC (rev 6286)
@@ -67,6 +67,7 @@
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<TargetMachine>MachineX86</TargetMachine>
+ <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
Modified: trunk/TTXSamples/TTXKcodeChange/TTXKcodeChange.v12.vcxproj
===================================================================
--- trunk/TTXSamples/TTXKcodeChange/TTXKcodeChange.v12.vcxproj 2016-01-31 14:31:30 UTC (rev 6285)
+++ trunk/TTXSamples/TTXKcodeChange/TTXKcodeChange.v12.vcxproj 2016-02-01 15:14:14 UTC (rev 6286)
@@ -67,6 +67,7 @@
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<TargetMachine>MachineX86</TargetMachine>
+ <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
Modified: trunk/TTXSamples/TTXKcodeChange/TTXKcodeChange.v14.vcxproj
===================================================================
--- trunk/TTXSamples/TTXKcodeChange/TTXKcodeChange.v14.vcxproj 2016-01-31 14:31:30 UTC (rev 6285)
+++ trunk/TTXSamples/TTXKcodeChange/TTXKcodeChange.v14.vcxproj 2016-02-01 15:14:14 UTC (rev 6286)
@@ -67,6 +67,7 @@
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<TargetMachine>MachineX86</TargetMachine>
+ <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
Modified: trunk/TTXSamples/TTXOutputBuffering/TTXOutputBuffering.v11.vcxproj
===================================================================
--- trunk/TTXSamples/TTXOutputBuffering/TTXOutputBuffering.v11.vcxproj 2016-01-31 14:31:30 UTC (rev 6285)
+++ trunk/TTXSamples/TTXOutputBuffering/TTXOutputBuffering.v11.vcxproj 2016-02-01 15:14:14 UTC (rev 6286)
@@ -67,6 +67,7 @@
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<TargetMachine>MachineX86</TargetMachine>
+ <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
Modified: trunk/TTXSamples/TTXOutputBuffering/TTXOutputBuffering.v12.vcxproj
===================================================================
--- trunk/TTXSamples/TTXOutputBuffering/TTXOutputBuffering.v12.vcxproj 2016-01-31 14:31:30 UTC (rev 6285)
+++ trunk/TTXSamples/TTXOutputBuffering/TTXOutputBuffering.v12.vcxproj 2016-02-01 15:14:14 UTC (rev 6286)
@@ -67,6 +67,7 @@
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<TargetMachine>MachineX86</TargetMachine>
+ <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
Modified: trunk/TTXSamples/TTXOutputBuffering/TTXOutputBuffering.v14.vcxproj
===================================================================
--- trunk/TTXSamples/TTXOutputBuffering/TTXOutputBuffering.v14.vcxproj 2016-01-31 14:31:30 UTC (rev 6285)
+++ trunk/TTXSamples/TTXOutputBuffering/TTXOutputBuffering.v14.vcxproj 2016-02-01 15:14:14 UTC (rev 6286)
@@ -67,6 +67,7 @@
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<TargetMachine>MachineX86</TargetMachine>
+ <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
Modified: trunk/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.v11.vcxproj
===================================================================
--- trunk/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.v11.vcxproj 2016-01-31 14:31:30 UTC (rev 6285)
+++ trunk/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.v11.vcxproj 2016-02-01 15:14:14 UTC (rev 6286)
@@ -68,6 +68,7 @@
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<TargetMachine>MachineX86</TargetMachine>
+ <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
Modified: trunk/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.v12.vcxproj
===================================================================
--- trunk/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.v12.vcxproj 2016-01-31 14:31:30 UTC (rev 6285)
+++ trunk/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.v12.vcxproj 2016-02-01 15:14:14 UTC (rev 6286)
@@ -68,6 +68,7 @@
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<TargetMachine>MachineX86</TargetMachine>
+ <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
Modified: trunk/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.v14.vcxproj
===================================================================
--- trunk/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.v14.vcxproj 2016-01-31 14:31:30 UTC (rev 6285)
+++ trunk/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.v14.vcxproj 2016-02-01 15:14:14 UTC (rev 6286)
@@ -68,6 +68,7 @@
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<TargetMachine>MachineX86</TargetMachine>
+ <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
Modified: trunk/TTXSamples/TTXResizeMenu/TTXResizeMenu.c
===================================================================
--- trunk/TTXSamples/TTXResizeMenu/TTXResizeMenu.c 2016-01-31 14:31:30 UTC (rev 6285)
+++ trunk/TTXSamples/TTXResizeMenu/TTXResizeMenu.c 2016-02-01 15:14:14 UTC (rev 6286)
@@ -153,18 +153,13 @@
}
static void PASCAL FAR TTXInit(PTTSet ts, PComVar cv) {
- OSVERSIONINFO osvi;
-
pvar->ts = ts;
pvar->cv = cv;
pvar->ReplaceTermDlg = FALSE;
pvar->ResizeMenu = NULL;
pvar->MenuItems = 0;
- osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
- GetVersionEx(&osvi);
- if ((osvi.dwPlatformId == VER_PLATFORM_WIN32_NT && osvi.dwMajorVersion == 4) ||
- (osvi.dwPlatformId == VER_PLATFORM_WIN32_WINDOWS && osvi.dwMinorVersion < 10)) {
+ if (!HasMultiMonitorSupport()) {
pvar->useMultiMonitorAPI = FALSE;
}
else {
Modified: trunk/TTXSamples/TTXResizeMenu/TTXResizeMenu.v10.vcxproj
===================================================================
--- trunk/TTXSamples/TTXResizeMenu/TTXResizeMenu.v10.vcxproj 2016-01-31 14:31:30 UTC (rev 6285)
+++ trunk/TTXSamples/TTXResizeMenu/TTXResizeMenu.v10.vcxproj 2016-02-01 15:14:14 UTC (rev 6286)
@@ -59,6 +59,7 @@
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
</ClCompile>
<Link>
+ <AdditionalDependencies>$(SolutionDir)..\teraterm\$(Configuration)\ttpcmn.lib;%(AdditionalDependencies)</AdditionalDependencies>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<TargetMachine>MachineX86</TargetMachine>
@@ -75,6 +76,7 @@
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
<Link>
+ <AdditionalDependencies>$(SolutionDir)..\teraterm\$(Configuration)\ttpcmn.lib;%(AdditionalDependencies)</AdditionalDependencies>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<OptimizeReferences>true</OptimizeReferences>
Modified: trunk/TTXSamples/TTXResizeMenu/TTXResizeMenu.v11.vcxproj
===================================================================
--- trunk/TTXSamples/TTXResizeMenu/TTXResizeMenu.v11.vcxproj 2016-01-31 14:31:30 UTC (rev 6285)
+++ trunk/TTXSamples/TTXResizeMenu/TTXResizeMenu.v11.vcxproj 2016-02-01 15:14:14 UTC (rev 6286)
@@ -64,9 +64,11 @@
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
</ClCompile>
<Link>
+ <AdditionalDependencies>$(SolutionDir)..\teraterm\$(Configuration)\ttpcmn.lib;%(AdditionalDependencies)</AdditionalDependencies>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<TargetMachine>MachineX86</TargetMachine>
+ <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -79,6 +81,7 @@
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
<Link>
+ <AdditionalDependencies>$(SolutionDir)..\teraterm\$(Configuration)\ttpcmn.lib;%(AdditionalDependencies)</AdditionalDependencies>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<OptimizeReferences>true</OptimizeReferences>
Modified: trunk/TTXSamples/TTXResizeMenu/TTXResizeMenu.v12.vcxproj
===================================================================
--- trunk/TTXSamples/TTXResizeMenu/TTXResizeMenu.v12.vcxproj 2016-01-31 14:31:30 UTC (rev 6285)
+++ trunk/TTXSamples/TTXResizeMenu/TTXResizeMenu.v12.vcxproj 2016-02-01 15:14:14 UTC (rev 6286)
@@ -64,9 +64,11 @@
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
</ClCompile>
<Link>
+ <AdditionalDependencies>$(SolutionDir)..\teraterm\$(Configuration)\ttpcmn.lib;%(AdditionalDependencies)</AdditionalDependencies>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<TargetMachine>MachineX86</TargetMachine>
+ <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -79,6 +81,7 @@
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
<Link>
+ <AdditionalDependencies>$(SolutionDir)..\teraterm\$(Configuration)\ttpcmn.lib;%(AdditionalDependencies)</AdditionalDependencies>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<OptimizeReferences>true</OptimizeReferences>
Modified: trunk/TTXSamples/TTXResizeMenu/TTXResizeMenu.v14.vcxproj
===================================================================
--- trunk/TTXSamples/TTXResizeMenu/TTXResizeMenu.v14.vcxproj 2016-01-31 14:31:30 UTC (rev 6285)
+++ trunk/TTXSamples/TTXResizeMenu/TTXResizeMenu.v14.vcxproj 2016-02-01 15:14:14 UTC (rev 6286)
@@ -64,9 +64,11 @@
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
</ClCompile>
<Link>
+ <AdditionalDependencies>$(SolutionDir)..\teraterm\$(Configuration)\ttpcmn.lib;%(AdditionalDependencies)</AdditionalDependencies>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<TargetMachine>MachineX86</TargetMachine>
+ <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -79,6 +81,7 @@
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
<Link>
+ <AdditionalDependencies>$(SolutionDir)..\teraterm\$(Configuration)\ttpcmn.lib;%(AdditionalDependencies)</AdditionalDependencies>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<OptimizeReferences>true</OptimizeReferences>
Modified: trunk/TTXSamples/TTXResizeMenu/TTXResizeMenu.v9.vcproj
===================================================================
--- trunk/TTXSamples/TTXResizeMenu/TTXResizeMenu.v9.vcproj 2016-01-31 14:31:30 UTC (rev 6285)
+++ trunk/TTXSamples/TTXResizeMenu/TTXResizeMenu.v9.vcproj 2016-02-01 15:14:14 UTC (rev 6286)
@@ -62,6 +62,7 @@
/>
<Tool
Name="VCLinkerTool"
+ AdditionalDependencies=""$(SolutionDir)..\teraterm\$(ConfigurationName)\ttpcmn.lib""
LinkIncremental="2"
GenerateDebugInformation="true"
SubSystem="2"
@@ -135,6 +136,7 @@
/>
<Tool
Name="VCLinkerTool"
+ AdditionalDependencies=""$(SolutionDir)..\teraterm\$(ConfigurationName)\ttpcmn.lib""
LinkIncremental="1"
GenerateDebugInformation="true"
SubSystem="2"
Modified: trunk/TTXSamples/TTXResizeMenu/TTXResizeMenu.vcproj
===================================================================
--- trunk/TTXSamples/TTXResizeMenu/TTXResizeMenu.vcproj 2016-01-31 14:31:30 UTC (rev 6285)
+++ trunk/TTXSamples/TTXResizeMenu/TTXResizeMenu.vcproj 2016-02-01 15:14:14 UTC (rev 6286)
@@ -61,6 +61,7 @@
/>
<Tool
Name="VCLinkerTool"
+ AdditionalDependencies=""$(SolutionDir)..\teraterm\$(ConfigurationName)\ttpcmn.lib""
LinkIncremental="2"
GenerateDebugInformation="true"
SubSystem="2"
@@ -135,6 +136,7 @@
/>
<Tool
Name="VCLinkerTool"
+ AdditionalDependencies=""$(SolutionDir)..\teraterm\$(ConfigurationName)\ttpcmn.lib""
LinkIncremental="1"
GenerateDebugInformation="true"
SubSystem="2"
Modified: trunk/TTXSamples/TTXResizeWin/TTXResizeWin.v11.vcxproj
===================================================================
--- trunk/TTXSamples/TTXResizeWin/TTXResizeWin.v11.vcxproj 2016-01-31 14:31:30 UTC (rev 6285)
+++ trunk/TTXSamples/TTXResizeWin/TTXResizeWin.v11.vcxproj 2016-02-01 15:14:14 UTC (rev 6286)
@@ -67,6 +67,7 @@
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<TargetMachine>MachineX86</TargetMachine>
+ <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
Modified: trunk/TTXSamples/TTXResizeWin/TTXResizeWin.v12.vcxproj
===================================================================
--- trunk/TTXSamples/TTXResizeWin/TTXResizeWin.v12.vcxproj 2016-01-31 14:31:30 UTC (rev 6285)
+++ trunk/TTXSamples/TTXResizeWin/TTXResizeWin.v12.vcxproj 2016-02-01 15:14:14 UTC (rev 6286)
@@ -67,6 +67,7 @@
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<TargetMachine>MachineX86</TargetMachine>
+ <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
Modified: trunk/TTXSamples/TTXResizeWin/TTXResizeWin.v14.vcxproj
===================================================================
--- trunk/TTXSamples/TTXResizeWin/TTXResizeWin.v14.vcxproj 2016-01-31 14:31:30 UTC (rev 6285)
+++ trunk/TTXSamples/TTXResizeWin/TTXResizeWin.v14.vcxproj 2016-02-01 15:14:14 UTC (rev 6286)
@@ -67,6 +67,7 @@
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<TargetMachine>MachineX86</TargetMachine>
+ <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
Modified: trunk/TTXSamples/TTXShowCommandLine/TTXShowCommandLine.v11.vcxproj
===================================================================
--- trunk/TTXSamples/TTXShowCommandLine/TTXShowCommandLine.v11.vcxproj 2016-01-31 14:31:30 UTC (rev 6285)
+++ trunk/TTXSamples/TTXShowCommandLine/TTXShowCommandLine.v11.vcxproj 2016-02-01 15:14:14 UTC (rev 6286)
@@ -67,6 +67,7 @@
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<TargetMachine>MachineX86</TargetMachine>
+ <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
Modified: trunk/TTXSamples/TTXShowCommandLine/TTXShowCommandLine.v12.vcxproj
===================================================================
--- trunk/TTXSamples/TTXShowCommandLine/TTXShowCommandLine.v12.vcxproj 2016-01-31 14:31:30 UTC (rev 6285)
+++ trunk/TTXSamples/TTXShowCommandLine/TTXShowCommandLine.v12.vcxproj 2016-02-01 15:14:14 UTC (rev 6286)
@@ -67,6 +67,7 @@
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<TargetMachine>MachineX86</TargetMachine>
+ <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
Modified: trunk/TTXSamples/TTXShowCommandLine/TTXShowCommandLine.v14.vcxproj
===================================================================
--- trunk/TTXSamples/TTXShowCommandLine/TTXShowCommandLine.v14.vcxproj 2016-01-31 14:31:30 UTC (rev 6285)
+++ trunk/TTXSamples/TTXShowCommandLine/TTXShowCommandLine.v14.vcxproj 2016-02-01 15:14:14 UTC (rev 6286)
@@ -67,6 +67,7 @@
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<TargetMachine>MachineX86</TargetMachine>
+ <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
Modified: trunk/TTXSamples/TTXViewMode/TTXViewMode.v11.vcxproj
===================================================================
--- trunk/TTXSamples/TTXViewMode/TTXViewMode.v11.vcxproj 2016-01-31 14:31:30 UTC (rev 6285)
+++ trunk/TTXSamples/TTXViewMode/TTXViewMode.v11.vcxproj 2016-02-01 15:14:14 UTC (rev 6286)
@@ -67,6 +67,7 @@
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<TargetMachine>MachineX86</TargetMachine>
+ <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
Modified: trunk/TTXSamples/TTXViewMode/TTXViewMode.v12.vcxproj
===================================================================
--- trunk/TTXSamples/TTXViewMode/TTXViewMode.v12.vcxproj 2016-01-31 14:31:30 UTC (rev 6285)
+++ trunk/TTXSamples/TTXViewMode/TTXViewMode.v12.vcxproj 2016-02-01 15:14:14 UTC (rev 6286)
@@ -67,6 +67,7 @@
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<TargetMachine>MachineX86</TargetMachine>
+ <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
Modified: trunk/TTXSamples/TTXViewMode/TTXViewMode.v14.vcxproj
===================================================================
--- trunk/TTXSamples/TTXViewMode/TTXViewMode.v14.vcxproj 2016-01-31 14:31:30 UTC (rev 6285)
+++ trunk/TTXSamples/TTXViewMode/TTXViewMode.v14.vcxproj 2016-02-01 15:14:14 UTC (rev 6286)
@@ -67,6 +67,7 @@
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<TargetMachine>MachineX86</TargetMachine>
+ <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
Modified: trunk/TTXSamples/TTXttyrec/TTXttyplay.v11.vcxproj
===================================================================
--- trunk/TTXSamples/TTXttyrec/TTXttyplay.v11.vcxproj 2016-01-31 14:31:30 UTC (rev 6285)
+++ trunk/TTXSamples/TTXttyrec/TTXttyplay.v11.vcxproj 2016-02-01 15:14:14 UTC (rev 6286)
@@ -68,6 +68,7 @@
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<TargetMachine>MachineX86</TargetMachine>
+ <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
Modified: trunk/TTXSamples/TTXttyrec/TTXttyplay.v12.vcxproj
===================================================================
--- trunk/TTXSamples/TTXttyrec/TTXttyplay.v12.vcxproj 2016-01-31 14:31:30 UTC (rev 6285)
+++ trunk/TTXSamples/TTXttyrec/TTXttyplay.v12.vcxproj 2016-02-01 15:14:14 UTC (rev 6286)
@@ -68,6 +68,7 @@
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<TargetMachine>MachineX86</TargetMachine>
+ <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
Modified: trunk/TTXSamples/TTXttyrec/TTXttyplay.v14.vcxproj
===================================================================
--- trunk/TTXSamples/TTXttyrec/TTXttyplay.v14.vcxproj 2016-01-31 14:31:30 UTC (rev 6285)
+++ trunk/TTXSamples/TTXttyrec/TTXttyplay.v14.vcxproj 2016-02-01 15:14:14 UTC (rev 6286)
@@ -68,6 +68,7 @@
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<TargetMachine>MachineX86</TargetMachine>
+ <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
Modified: trunk/TTXSamples/TTXttyrec/TTXttyrec.v11.vcxproj
===================================================================
--- trunk/TTXSamples/TTXttyrec/TTXttyrec.v11.vcxproj 2016-01-31 14:31:30 UTC (rev 6285)
+++ trunk/TTXSamples/TTXttyrec/TTXttyrec.v11.vcxproj 2016-02-01 15:14:14 UTC (rev 6286)
@@ -67,6 +67,7 @@
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<TargetMachine>MachineX86</TargetMachine>
+ <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
Modified: trunk/TTXSamples/TTXttyrec/TTXttyrec.v12.vcxproj
===================================================================
--- trunk/TTXSamples/TTXttyrec/TTXttyrec.v12.vcxproj 2016-01-31 14:31:30 UTC (rev 6285)
+++ trunk/TTXSamples/TTXttyrec/TTXttyrec.v12.vcxproj 2016-02-01 15:14:14 UTC (rev 6286)
@@ -67,6 +67,7 @@
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<TargetMachine>MachineX86</TargetMachine>
+ <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
Modified: trunk/TTXSamples/TTXttyrec/TTXttyrec.v14.vcxproj
===================================================================
--- trunk/TTXSamples/TTXttyrec/TTXttyrec.v14.vcxproj 2016-01-31 14:31:30 UTC (rev 6285)
+++ trunk/TTXSamples/TTXttyrec/TTXttyrec.v14.vcxproj 2016-02-01 15:14:14 UTC (rev 6286)
@@ -67,6 +67,7 @@
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<TargetMachine>MachineX86</TargetMachine>
+ <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
Modified: trunk/TTXSamples/ttxtest/TTXtest.v11.vcxproj
===================================================================
--- trunk/TTXSamples/ttxtest/TTXtest.v11.vcxproj 2016-01-31 14:31:30 UTC (rev 6285)
+++ trunk/TTXSamples/ttxtest/TTXtest.v11.vcxproj 2016-02-01 15:14:14 UTC (rev 6286)
@@ -67,6 +67,7 @@
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<TargetMachine>MachineX86</TargetMachine>
+ <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
Modified: trunk/TTXSamples/ttxtest/TTXtest.v12.vcxproj
===================================================================
--- trunk/TTXSamples/ttxtest/TTXtest.v12.vcxproj 2016-01-31 14:31:30 UTC (rev 6285)
+++ trunk/TTXSamples/ttxtest/TTXtest.v12.vcxproj 2016-02-01 15:14:14 UTC (rev 6286)
@@ -67,6 +67,7 @@
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<TargetMachine>MachineX86</TargetMachine>
+ <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
Modified: trunk/TTXSamples/ttxtest/TTXtest.v14.vcxproj
===================================================================
--- trunk/TTXSamples/ttxtest/TTXtest.v14.vcxproj 2016-01-31 14:31:30 UTC (rev 6285)
+++ trunk/TTXSamples/ttxtest/TTXtest.v14.vcxproj 2016-02-01 15:14:14 UTC (rev 6286)
@@ -67,6 +67,7 @@
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<TargetMachine>MachineX86</TargetMachine>
+ <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
Property changes on: trunk/teraterm
___________________________________________________________________
Modified: svn:mergeinfo
-
+ /branches/vs2015_warn/teraterm:6194-6285
Modified: trunk/teraterm/common/teraterm.h
===================================================================
--- trunk/teraterm/common/teraterm.h 2016-01-31 14:31:30 UTC (rev 6285)
+++ trunk/teraterm/common/teraterm.h 2016-02-01 15:14:14 UTC (rev 6286)
@@ -12,6 +12,25 @@
#endif /* NO_INET6 */
#include <windows.h>
+/* _MSC_VER \x82̒l
+Visual C++ 8.0 (Visual Studio 2005) 1400
+Visual C++ 9.0 (Visual Studio 2008) 1500
+Visual C++ 10.0 (Visual Studio 2010) 1600
+Visual C++ 11.0 (Visual Studio 2012) 1700
+Visual C++ 12.0 (Visual Studio 2013) 1800
+Visual C++ 14.0 (Visual Studio 2015) 1900
+*/
+
+/* VS2015(VC14.0)\x82\xBE\x82ƁAWSASocketA(), inet_ntoa() \x82Ȃǂ\xCCAPI\x82\xAAdeprecated\x82ł\xA0\x82\xE9\x82\xC6
+ * \x8Cx\x8D\x90\x82\xB7\x82邽\x82߂ɁA\x8Cx\x8D\x90\x82\xF0\x97}\x8E~\x82\xB7\x82\xE9\x81B\x91\xE3\x91֊\x94\x82ɒu\x8A\xB7\x82\xB7\x82\xE9\x82ƁAVS2005(VC8.0)\x82Ńr\x83\x8B\x83h
+ * \x82ł\xAB\x82Ȃ\xAD\x82Ȃ邽\x82߁A\x8Cx\x8D\x90\x82\xF0\x97}\x8E~\x82\xB7\x82邾\x82\xAF\x82Ƃ\xB7\x82\xE9\x81B
+ */
+#if _MSC_VER >= 1800 // VSC2013(VC12.0) or later
+ #ifndef _WINSOCK_DEPRECATED_NO_WARNINGS
+ #define _WINSOCK_DEPRECATED_NO_WARNINGS
+ #endif
+#endif
+
// AKASI\x8E\x81\x82ɂ\xE6\x82\xE9Eterm\x95\x97\x93\xA7\x89߃E\x83B\x83\x93\x83h\x83E
#define ALPHABLEND_TYPE2
Modified: trunk/teraterm/common/ttlib.c
===================================================================
--- trunk/teraterm/common/ttlib.c 2016-01-31 14:31:30 UTC (rev 6285)
+++ trunk/teraterm/common/ttlib.c 2016-02-01 15:14:14 UTC (rev 6286)
@@ -16,6 +16,29 @@
// for _ismbblead
#include <mbctype.h>
+/* OS version with GetVersionEx(*1)
+
+ dwMajorVersion dwMinorVersion dwPlatformId
+Windows95 4 0 VER_PLATFORM_WIN32_WINDOWS
+Windows98 4 10 VER_PLATFORM_WIN32_WINDOWS
+WindowsMe 4 90 VER_PLATFORM_WIN32_WINDOWS
+WindowsNT4.0 4 0 VER_PLATFORM_WIN32_NT
+Windows2000 5 0 VER_PLATFORM_WIN32_NT
+WindowsXP 5 1 VER_PLATFORM_WIN32_NT
+WindowsXPx64 5 2 VER_PLATFORM_WIN32_NT
+WindowsVista 6 0 VER_PLATFORM_WIN32_NT
+Windows7 6 1 VER_PLATFORM_WIN32_NT
+Windows8 6 2 VER_PLATFORM_WIN32_NT
+Windows8.1(*2) 6 2 VER_PLATFORM_WIN32_NT
+Windows8.1(*3) 6 3 VER_PLATFORM_WIN32_NT
+Windows10(*2) 6 2 VER_PLATFORM_WIN32_NT
+Windows10(*3) 10 0 VER_PLATFORM_WIN32_NT
+
+(*1) GetVersionEx()\x82\xAA c4996 warning \x82ƂȂ\xE9\x82̂́AVS2013(_MSC_VER=1800) \x82\xA9\x82\xE7\x82ł\xB7\x81B
+(*2) manifest\x82\xC9 supportedOS Id \x82\xF0\x92lj\xC1\x82\xB5\x82Ă\xA2\x82Ȃ\xA2\x81B
+(*3) manifest\x82\xC9 supportedOS Id \x82\xF0\x92lj\xC1\x82\xB5\x82Ă\xA2\x82\xE9\x81B
+*/
+
// for isInvalidFileNameChar / replaceInvalidFileNameChar
static char *invalidFileNameChars = "\\/:*?\"<>|";
@@ -955,27 +978,298 @@
OutputDebugString(tmp);
}
-BOOL is_NT4()
+#if (_MSC_VER < 1800)
+BOOL vercmp(
+ DWORD cond_val,
+ DWORD act_val,
+ DWORD dwTypeMask)
{
+ switch (dwTypeMask) {
+ case VER_EQUAL:
+ if (act_val == cond_val) {
+ return TRUE;
+ }
+ break;
+ case VER_GREATER:
+ if (act_val > cond_val) {
+ return TRUE;
+ }
+ break;
+ case VER_GREATER_EQUAL:
+ if (act_val >= cond_val) {
+ return TRUE;
+ }
+ break;
+ case VER_LESS:
+ if (act_val < cond_val) {
+ return TRUE;
+ }
+ break;
+ case VER_LESS_EQUAL:
+ if (act_val <= cond_val) {
+ return TRUE;
+ }
+ break;
+ }
+ return FALSE;
+}
+
+/*
+DWORDLONG dwlConditionMask
+| 000 | 000 | 000 | 000 | 000 | 000 | 000 | 000 |
+ | | | | | | | +- condition of dwMinorVersion
+ | | | | | | +------- condition of dwMajorVersion
+ | | | | | +------------- condition of dwBuildNumber
+ | | | | +------------------- condition of dwPlatformId
+ | | | +------------------------- condition of wServicePackMinor
+ | | +------------------------------- condition of wServicePackMajor
+ | +------------------------------------- condition of wSuiteMask
+ +------------------------------------------- condition of wProductType
+*/
+BOOL _myVerifyVersionInfo(
+ LPOSVERSIONINFOEX lpVersionInformation,
+ DWORD dwTypeMask,
+ DWORDLONG dwlConditionMask)
+{
OSVERSIONINFO osvi;
+ WORD cond;
+ BOOL ret, check_next;
osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
GetVersionEx(&osvi);
- if (osvi.dwPlatformId == VER_PLATFORM_WIN32_NT &&
- osvi.dwMajorVersion == 4) {
+
+ if (dwTypeMask & VER_BUILDNUMBER) {
+ cond = (WORD)((dwlConditionMask >> (2*3)) & 0x07);
+ if (!vercmp(lpVersionInformation->dwBuildNumber, osvi.dwBuildNumber, cond)) {
+ return FALSE;
+ }
+ }
+ if (dwTypeMask & VER_PLATFORMID) {
+ cond = (WORD)((dwlConditionMask >> (3*3)) & 0x07);
+ if (!vercmp(lpVersionInformation->dwPlatformId, osvi.dwPlatformId, cond)) {
+ return FALSE;
+ }
+ }
+ ret = TRUE;
+ if (dwTypeMask & (VER_MAJORVERSION | VER_MINORVERSION)) {
+ check_next = TRUE;
+ if (dwTypeMask & VER_MAJORVERSION) {
+ cond = (WORD)((dwlConditionMask >> (1*3)) & 0x07);
+ if (cond == VER_EQUAL) {
+ if (!vercmp(lpVersionInformation->dwMajorVersion, osvi.dwMajorVersion, cond)) {
+ return FALSE;
+ }
+ }
+ else {
+ ret = vercmp(lpVersionInformation->dwMajorVersion, osvi.dwMajorVersion, cond);
+ // ret: result of major version
+ if (!vercmp(lpVersionInformation->dwMajorVersion, osvi.dwMajorVersion, VER_EQUAL)) {
+ // !vercmp(...: result of GRATOR/LESS than (not "GRATOR/LESS than or equal to") of major version
+ // e.g.
+ // lpvi:5.1 actual:5.0 cond:VER_GREATER_EQUAL ret:TRUE !vercmp(...:FALSE must check minor
+ // lpvi:5.1 actual:5.1 cond:VER_GREATER_EQUAL ret:TRUE !vercmp(...:FALSE must check minor
+ // lpvi:5.1 actual:5.2 cond:VER_GREATER_EQUAL ret:TRUE !vercmp(...:FALSE must check minor
+ // lpvi:5.1 actual:6.0 cond:VER_GREATER_EQUAL ret:TRUE !vercmp(...:TRUE must not check minor
+ // lpvi:5.1 actual:6.1 cond:VER_GREATER_EQUAL ret:TRUE !vercmp(...:TRUE must not check minor
+ // lpvi:5.1 actual:6.2 cond:VER_GREATER_EQUAL ret:TRUE !vercmp(...:TRUE must not check minor
+ // lpvi:5.1 actual:5.0 cond:VER_GREATER ret:FALSE !vercmp(...:FALSE must check minor
+ // lpvi:5.1 actual:5.1 cond:VER_GREATER ret:FALSE !vercmp(...:FALSE must check minor
+ // lpvi:5.1 actual:5.2 cond:VER_GREATER ret:FALSE !vercmp(...:FALSE must check minor
+ // lpvi:5.1 actual:6.0 cond:VER_GREATER ret:TRUE !vercmp(...:TRUE must not check minor
+ // lpvi:5.1 actual:6.1 cond:VER_GREATER ret:TRUE !vercmp(...:TRUE must not check minor
+ // lpvi:5.1 actual:6.2 cond:VER_GREATER ret:TRUE !vercmp(...:TRUE must not check minor
+ check_next = FALSE;
+ }
+ }
+ }
+ if (check_next && (dwTypeMask & VER_MINORVERSION)) {
+ cond = (WORD)((dwlConditionMask >> (0*3)) & 0x07);
+ if (cond == VER_EQUAL) {
+ if (!vercmp(lpVersionInformation->dwMinorVersion, osvi.dwMinorVersion, cond)) {
+ return FALSE;
+ }
+ }
+ else {
+ ret = vercmp(lpVersionInformation->dwMinorVersion, osvi.dwMinorVersion, cond);
+ }
+ }
+ }
+ return ret;
+}
+#endif
+
+BOOL myVerifyVersionInfo(
+ LPOSVERSIONINFOEX lpVersionInformation,
+ DWORD dwTypeMask,
+ DWORDLONG dwlConditionMask)
+{
+#if (_MSC_VER >= 1800)
+ return VerifyVersionInfo(lpVersionInformation, dwTypeMask, dwlConditionMask);
+#else
+ return _myVerifyVersionInfo(lpVersionInformation, dwTypeMask, dwlConditionMask);
+#endif
+}
+
+// OS\x82\xAA Windows95 \x82\xA9\x82ǂ\xA4\x82\xA9\x82ʂ\xB7\x82\xE9\x81B
+//
+// return TRUE: 95
+// FALSE: Not 95
+BOOL IsWindows95()
+{
+ OSVERSIONINFOEX osvi;
+ DWORDLONG dwlConditionMask = 0;
+ int op = VER_EQUAL;
+ BOOL ret;
+
+ ZeroMemory(&osvi, sizeof(OSVERSIONINFOEX));
+ osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEX);
+ osvi.dwPlatformId = VER_PLATFORM_WIN32_WINDOWS;
+ osvi.dwMajorVersion = 4;
+ osvi.dwMinorVersion = 0;
+ VER_SET_CONDITION(dwlConditionMask, VER_PLATFORMID, op);
+ VER_SET_CONDITION(dwlConditionMask, VER_MAJORVERSION, op);
+ VER_SET_CONDITION(dwlConditionMask, VER_MINORVERSION, op);
+ ret = myVerifyVersionInfo(&osvi, VER_PLATFORMID | VER_MAJORVERSION | VER_MINORVERSION, dwlConditionMask);
+ return (ret);
+}
+
+// OS\x82\xAA WindowsNT \x83J\x81[\x83l\x83\x8B\x82\xA9\x82ǂ\xA4\x82\xA9\x82ʂ\xB7\x82\xE9\x81B
+//
+// return TRUE: NT kernel
+// FALSE: Not NT4 kernel
+BOOL IsWindowsNTKernel()
+{
+ OSVERSIONINFOEX osvi;
+ DWORDLONG dwlConditionMask = 0;
+ int op = VER_EQUAL;
+ BOOL ret;
+
+ ZeroMemory(&osvi, sizeof(OSVERSIONINFOEX));
+ osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEX);
+ osvi.dwPlatformId = VER_PLATFORM_WIN32_NT;
+ VER_SET_CONDITION(dwlConditionMask, VER_PLATFORMID, op);
+ ret = myVerifyVersionInfo(&osvi, VER_PLATFORMID, dwlConditionMask);
+ return (ret);
+}
+
+// OS\x82\xAA WindowsNT4.0 \x82\xA9\x82ǂ\xA4\x82\xA9\x82ʂ\xB7\x82\xE9\x81B
+//
+// return TRUE: NT4.0
+// FALSE: Not NT4.0
+BOOL IsWindowsNT4()
+{
+ return is_NT4();
+}
+
+BOOL is_NT4()
+{
+ // VS2013\x88ȏゾ\x82\xC6 GetVersionEx() \x82\xAA\x8Cx\x8D\x90\x82ƂȂ邽\x82߁AVerifyVersionInfo() \x82\xF0\x8Eg\x82\xA4\x81B
+ // \x82\xB5\x82\xA9\x82\xB5\x81AVS2013\x82Ńr\x83\x8B\x83h\x82\xB5\x82\xBD\x83v\x83\x8D\x83O\x83\x89\x83\x80\x82́A\x82\xBB\x82\xE0\x82\xBB\x82\xE0 NT4.0 \x82ł͓\xAE\x8D삵\x82Ȃ\xA2\x82\xBD\x82߁A
+ // \x96\xB3\x8F\xF0\x8C\x8F\x82\xC9 FALSE \x82\xF0\x95Ԃ\xB5\x82Ă\xE0\x82悢\x82\xA9\x82\xE0\x82\xB5\x82\xEA\x82Ȃ\xA2\x81B
+ OSVERSIONINFOEX osvi;
+ DWORDLONG dwlConditionMask = 0;
+ int op = VER_EQUAL;
+ BOOL ret;
+
+ ZeroMemory(&osvi, sizeof(OSVERSIONINFOEX));
+ osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEX);
+ osvi.dwPlatformId = VER_PLATFORM_WIN32_NT;
+ osvi.dwMajorVersion = 4;
+ VER_SET_CONDITION(dwlConditionMask, VER_PLATFORMID, op);
+ VER_SET_CONDITION(dwlConditionMask, VER_MAJORVERSION, op);
+ ret = myVerifyVersionInfo(&osvi, VER_PLATFORMID | VER_MAJORVERSION, dwlConditionMask);
+ return (ret);
+}
+
+// OS\x82\xAA \x8Ew\x92肳\x82ꂽ\x83o\x81[\x83W\x83\x87\x83\x93\x88ȍ~ \x82\xA9\x82ǂ\xA4\x82\xA9\x82ʂ\xB7\x82\xE9\x81B
+
+BOOL IsWindowsVerOrLater(DWORD dwMajorVersion, DWORD dwMinorVersion)
+{
+ OSVERSIONINFOEX osvi;
+ DWORDLONG dwlConditionMask = 0;
+ int op = VER_GREATER_EQUAL;
+ BOOL ret;
+
+ ZeroMemory(&osvi, sizeof(OSVERSIONINFOEX));
+ osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEX);
+ osvi.dwMajorVersion = dwMajorVersion;
+ osvi.dwMinorVersion = dwMinorVersion;
+ VER_SET_CONDITION(dwlConditionMask, VER_MAJORVERSION, op);
+ VER_SET_CONDITION(dwlConditionMask, VER_MINORVERSION, op);
+ ret = myVerifyVersionInfo(&osvi, VER_MAJORVERSION | VER_MINORVERSION, dwlConditionMask);
+ return (ret);
+}
+
+// OS\x82\xAA Windows2000 \x88ȍ~ \x82\xA9\x82ǂ\xA4\x82\xA9\x82ʂ\xB7\x82\xE9\x81B
+//
+// return TRUE: 2000 or later
+// FALSE: NT4 or earlier
+BOOL IsWindows2000OrLater(void)
+{
+ return IsWindowsVerOrLater(5, 0);
+}
+
+// OS\x82\xAA WindowsVista \x88ȍ~ \x82\xA9\x82ǂ\xA4\x82\xA9\x82ʂ\xB7\x82\xE9\x81B
+//
+// return TRUE: Vista or later
+// FALSE: XP or earlier
+BOOL IsWindowsVistaOrLater(void)
+{
+ return IsWindowsVerOrLater(6, 0);
+}
+
+// OS\x82\xAA Windows7 \x88ȍ~ \x82\xA9\x82ǂ\xA4\x82\xA9\x82ʂ\xB7\x82\xE9\x81B
+//
+// return TRUE: 7 or later
+// FALSE: Vista or earlier
+BOOL IsWindows7OrLater(void)
+{
+ return IsWindowsVerOrLater(6, 1);
+}
+
+// OS \x82\xAA\x83}\x83\x8B\x83`\x83\x82\x83j\x83^ API \x82\xF0\x83T\x83|\x81[\x83g\x82\xB5\x82Ă\xA2\x82邩\x82ǂ\xA4\x82\xA9\x82ʂ\xB7\x82\xE9\x81B
+// 98 \x88ȍ~/2000 \x88ȍ~\x82\xCD TRUE \x82\xF0\x95Ԃ\xB7
+BOOL HasMultiMonitorSupport()
+{
+ HMODULE mod;
+
+ if (((mod = GetModuleHandle("user32.dll")) != NULL) &&
+ (GetProcAddress(mod, "MonitorFromPoint") != NULL)) {
return TRUE;
}
return FALSE;
}
+// OS \x82\xAA GetAdaptersAddresses \x82\xF0\x83T\x83|\x81[\x83g\x82\xB5\x82Ă\xA2\x82邩\x82ǂ\xA4\x82\xA9\x82ʂ\xB7\x82\xE9\x81B
+// XP \x88ȍ~\x82\xCD TRUE \x82\xF0\x95Ԃ\xB7
+// 2000 \x88ȍ~\x82\xCD IPv6 \x82ɑΉ\x9E\x82\xB5\x82Ă\xA2\x82邪 GetAdaptersAddresses \x82\xAA\x82Ȃ\xA2
+BOOL HasGetAdaptersAddresses()
+{
+ HMODULE mod;
+
+ if (((mod = GetModuleHandle("iphlpapi.dll")) != NULL) &&
+ (GetProcAddress(mod, "GetAdaptersAddresses") != NULL)) {
+ return TRUE;
+ }
+ return FALSE;
+}
+
+// OS \x82\xAA DnsQuery \x82\xF0\x83T\x83|\x81[\x83g\x82\xB5\x82Ă\xA2\x82邩\x82ǂ\xA4\x82\xA9\x82ʂ\xB7\x82\xE9\x81B
+// 2000 \x88ȍ~\x82\xCD TRUE \x82\xF0\x95Ԃ\xB7
+BOOL HasDnsQuery()
+{
+ HMODULE mod;
+
+ if (((mod = GetModuleHandle("Dnsapi.dll")) != NULL) &&
+ (GetProcAddress(mod, "DnsQuery") != NULL)) {
+ return TRUE;
+ }
+ return FALSE;
+}
+
int get_OPENFILENAME_SIZE()
{
- OSVERSIONINFO osvi;
-
- osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
- GetVersionEx(&osvi);
- if (osvi.dwPlatformId == VER_PLATFORM_WIN32_NT &&
- osvi.dwMajorVersion >= 5) {
+ if (IsWindows2000OrLater()) {
return sizeof(OPENFILENAME);
}
//return OPENFILENAME_SIZE_VERSION_400;
Modified: trunk/teraterm/common/ttlib.h
===================================================================
--- trunk/teraterm/common/ttlib.h 2016-01-31 14:31:30 UTC (rev 6285)
+++ trunk/teraterm/common/ttlib.h 2016-02-01 15:14:14 UTC (rev 6286)
@@ -46,6 +46,15 @@
void OutputDebugPrintf(char *fmt, ...);
BOOL is_NT4();
int get_OPENFILENAME_SIZE();
+BOOL IsWindows95();
+BOOL IsWindowsNT4();
+BOOL IsWindowsNTKernel();
+BOOL IsWindows2000OrLater();
+BOOL IsWindowsVistaOrLater();
+BOOL IsWindows7OrLater();
+BOOL HasMultiMonitorSupport();
+BOOL HasGetAdaptersAddresses();
+BOOL HasDnsQuery();
int KanjiCode2List(int lang, int kcode);
int List2KanjiCode(int lang, int kcode);
int KanjiCodeTranslate(int lang, int kcode);
Modified: trunk/teraterm/svnrev/svnrev.v14.vcxproj
===================================================================
--- trunk/teraterm/svnrev/svnrev.v14.vcxproj 2016-01-31 14:31:30 UTC (rev 6285)
+++ trunk/teraterm/svnrev/svnrev.v14.vcxproj 2016-02-01 15:14:14 UTC (rev 6286)
@@ -67,6 +67,7 @@
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
<TargetMachine>MachineX86</TargetMachine>
+ <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
Modified: trunk/teraterm/teraterm/clipboar.c
===================================================================
--- trunk/teraterm/teraterm/clipboar.c 2016-01-31 14:31:30 UTC (rev 6285)
+++ trunk/teraterm/teraterm/clipboar.c 2016-02-01 15:14:14 UTC (rev 6286)
@@ -576,7 +576,6 @@
POINT p;
RECT rc_dsk, rc_dlg;
int dlg_height, dlg_width;
- OSVERSIONINFO osvi;
static int ok2right, edit2ok, edit2bottom;
RECT rc_edit, rc_ok, rc_cancel;
// for status bar
@@ -622,10 +621,7 @@
// \x83L\x83\x83\x83\x8C\x83b\x83g\x82\xAA\x89\xE6\x96ʂ\xA9\x82\xE7\x82͂ݏo\x82\xB5\x82Ă\xA2\x82\xE9\x82Ƃ\xAB\x82ɓ\\x82\xE8\x95t\x82\xAF\x82\xF0\x82\xB7\x82\xE9\x82\xC6
// \x8Am\x94F\x83E\x83C\x83\x93\x83h\x83E\x82\xAA\x8C\xA9\x82\xA6\x82\xE9\x82Ƃ\xB1\x82\xEB\x82ɕ\\x8E\xA6\x82\xB3\x82\xEA\x82Ȃ\xA2\x82\xB1\x82Ƃ\xAA\x82\xA0\x82\xE9\x81B
// \x83E\x83C\x83\x93\x83h\x83E\x82\xA9\x82\xE7\x82͂ݏo\x82\xB5\x82\xBD\x8Fꍇ\x82ɒ\xB2\x90߂\xB7\x82\xE9 (2008.4.24 maya)
- osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
- GetVersionEx(&osvi);
- if ( (osvi.dwPlatformId == VER_PLATFORM_WIN32_NT && osvi.dwMajorVersion == 4) ||
- (osvi.dwPlatformId == VER_PLATFORM_WIN32_WINDOWS && osvi.dwMinorVersion < 10) ) {
+ if (!HasMultiMonitorSupport()) {
// NT4.0, 95 \x82̓}\x83\x8B\x83`\x83\x82\x83j\x83^API\x82ɔ\xF1\x91Ή\x9E
SystemParametersInfo(SPI_GETWORKAREA, 0, &rc_dsk, 0);
}
Modified: trunk/teraterm/teraterm/commlib.c
===================================================================
--- trunk/teraterm/teraterm/commlib.c 2016-01-31 14:31:30 UTC (rev 6285)
+++ trunk/teraterm/teraterm/commlib.c 2016-02-01 15:14:14 UTC (rev 6286)
@@ -1280,7 +1280,6 @@
DCB dcb;
DWORD DErr;
COMMTIMEOUTS ctmo;
- OSVERSIONINFO osvi;
strncpy_s(Temp, sizeof(Temp),DevName, _TRUNCATE);
c = Temp;
@@ -1291,9 +1290,7 @@
LPTFlag = (Temp[0]=='L') ||
(Temp[0]=='l');
- osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
- GetVersionEx(&osvi);
- if (osvi.dwPlatformId == VER_PLATFORM_WIN32_NT) {
+ if (IsWindowsNTKernel()) {
// \x83l\x83b\x83g\x83\x8F\x81[\x83N\x8B\xA4\x97L\x82Ƀ}\x83b\x83v\x82\xB3\x82ꂽ\x83f\x83o\x83C\x83X\x82\xAA\x91\x8A\x8E\xE8\x82̏ꍇ\x81A\x82\xB1\x82\xA4\x82\xB5\x82Ȃ\xA2\x82Ƃ\xA2\x82\xAF\x82Ȃ\xA2\x82炵\x82\xA2 (2011.01.25 maya)
// http://logmett.com/forum/viewtopic.php?f=2&t=1383
// http://msdn.microsoft.com/en-us/library/aa363858(v=vs.85).aspx#5
Modified: trunk/teraterm/teraterm/ftdlg.cpp
===================================================================
--- trunk/teraterm/teraterm/ftdlg.cpp 2016-01-31 14:31:30 UTC (rev 6285)
+++ trunk/teraterm/teraterm/ftdlg.cpp 2016-02-01 15:14:14 UTC (rev 6286)
@@ -177,7 +177,7 @@
// \x83\x8D\x83O\x83t\x83@\x83C\x83\x8B\x82̓t\x83\x8B\x83p\x83X\x95\\x8E\xA6\x82ɂ\xB7\x82\xE9(2004.8.6 yutaka)
SetDlgItemText(IDC_EDIT_FULLPATH, &(fv->FullName[0]));
- if (is_NT4()) {
+ if (IsWindowsNT4()) {
fuLoad = LR_VGACOLOR;
}
::PostMessage(GetSafeHwnd(),WM_SETICON,ICON_SMALL,
Modified: trunk/teraterm/teraterm/keyboard.c
===================================================================
--- trunk/teraterm/teraterm/keyboard.c 2016-01-31 14:31:30 UTC (rev 6285)
+++ trunk/teraterm/teraterm/keyboard.c 2016-02-01 15:14:14 UTC (rev 6286)
@@ -754,7 +754,7 @@
break;
case IdCommand:
Code[CodeLength] = 0;
- if (sscanf(Code, "%d", &wId) == 1)
+ if (sscanf(Code, "%hd", &wId) == 1)
PostMessage(HWin,WM_COMMAND,MAKELONG(wId,0),0);
break;
}
Modified: trunk/teraterm/teraterm/tekwin.cpp
===================================================================
--- trunk/teraterm/teraterm/tekwin.cpp 2016-01-31 14:31:30 UTC (rev 6285)
+++ trunk/teraterm/teraterm/tekwin.cpp 2016-02-01 15:14:14 UTC (rev 6286)
@@ -82,7 +82,7 @@
// register this window to the window list
RegWin(HVTWin,HTEKWin);
- if (is_NT4()) {
+ if (IsWindowsNT4()) {
fuLoad = LR_VGACOLOR;
}
::PostMessage(HTEKWin,WM_SETICON,ICON_SMALL,
Modified: trunk/teraterm/teraterm/teraterm.manifest
===================================================================
--- trunk/teraterm/teraterm/teraterm.manifest 2016-01-31 14:31:30 UTC (rev 6285)
+++ trunk/teraterm/teraterm/teraterm.manifest 2016-02-01 15:14:14 UTC (rev 6286)
@@ -1,18 +1,42 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
-
-<description></description>
-<dependency>
+<assembly manifestVersion="1.0"
+ xmlns="urn:schemas-microsoft-com:asm.v1"
+ xmlns:asmv3="urn:schemas-microsoft-com:asm.v3">
+ <description></description>
+ <dependency>
<dependentAssembly>
- <assemblyIdentity
- type="win32"
- name="Microsoft.Windows.Common-Controls"
- version="6.0.0.0"
- processorArchitecture="X86"
- publicKeyToken="6595b64144ccf1df"
- language="*"
+ <assemblyIdentity
+ type="win32"
+ name="Microsoft.Windows.Common-Controls"
+ version="6.0.0.0"
+ processorArchitecture="X86"
+ publicKeyToken="6595b64144ccf1df"
+ language="*"
+ />
+ <!--assemblyIdentity
+ type="win32"
+ name=SXS_ASSEMBLY_NAME
+ version=SXS_ASSEMBLY_VERSION
+ processorArchitecture=SXS_PROCESSOR_ARCHITECTURE
+ /-->
+ </dependentAssembly>
+ </dependency>
+ <!--trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
+ <security>
+ <requestedPrivileges>
+ <requestedExecutionLevel
+ level="asInvoker"
+ uiAccess="false"
/>
- </dependentAssembly>
-</dependency>
+ </requestedPrivileges>
+ </security>
+ </trustInfo-->
+ <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
+ <application>
+ <!-- This Id value indicates the application supports Windows Blue/Server 2012 R2 functionality-->
+ <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>
+ <!-- This Id value indicates the application supports Windows Threshold functionality-->
+ <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/>
+ </application>
+ </compatibility>
</assembly>
-
Modified: trunk/teraterm/teraterm/vtdisp.c
===================================================================
--- trunk/teraterm/teraterm/vtdisp.c 2016-01-31 14:31:30 UTC (rev 6285)
+++ trunk/teraterm/teraterm/vtdisp.c 2016-02-01 15:14:14 UTC (rev 6286)
@@ -187,16 +187,9 @@
// (2014.4.20 yutaka)
static BOOL IsLoadImageOnlyEnabled(void)
{
- OSVERSIONINFO osvi;
-
- osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
- GetVersionEx(&osvi);
// Vista \x96\xA2\x96\x9E\x82̏ꍇ\x82ɂ́A\x8D\xA1\x82܂Œʂ\xE8\x82̓ǂݍ\x9E\x82݂\xF0\x82\xB7\x82\xE9\x82悤\x82ɂ\xB5\x82\xBD
// cf. SVN#4571(2011.8.4)
- if (osvi.dwMajorVersion < 6) {
- return TRUE;
- }
- return FALSE;
+ return !IsWindowsVistaOrLater();
}
@@ -1804,25 +1797,8 @@
/* background paintbrush */
Background = CreateSolidBrush(ts.VTColor[1]);
/* CRT width & height */
- {
- OSVERSIONINFO ver;
- ZeroMemory( &ver, sizeof(ver) );
- ver.dwOSVersionInfoSize = sizeof(ver);
- GetVersionEx( &ver );
- switch( ver.dwPlatformId ) {
- // Windows 9x \x82\xA9 NT \x82\xA9\x82̔\xBB\x92\xE8
- case VER_PLATFORM_WIN32_WINDOWS:
- if( ver.dwMajorVersion > 4 ||
- (ver.dwMajorVersion == 4 && ver.dwMinorVersion >= 10) ) // Windows 98 or later
- bMultiDisplaySupport = TRUE;
- break;
- case VER_PLATFORM_WIN32_NT:
- if( ver.dwMajorVersion >= 5 ) // Windows 2000 or later
- bMultiDisplaySupport = TRUE;
- break;
- default:
- break;
- }
+ if (HasMultiMonitorSupport()) {
+ bMultiDisplaySupport = TRUE;
}
if( bMultiDisplaySupport ) {
VirtualScreen.left = GetSystemMetrics(SM_XVIRTUALSCREEN);
Modified: trunk/teraterm/teraterm/vtwin.cpp
===================================================================
--- trunk/teraterm/teraterm/vtwin.cpp 2016-01-31 14:31:30 UTC (rev 6285)
+++ trunk/teraterm/teraterm/vtwin.cpp 2016-02-01 15:14:14 UTC (rev 6286)
@@ -282,7 +282,7 @@
return;
}
- hc = (HCURSOR)LoadImage(NULL, MAKEINTRESOURCE(name), IMAGE_CURSOR,
+ hc = (HCURSOR)LoadImage(NULL, name, IMAGE_CURSOR,
0, 0, LR_DEFAULTSIZE | LR_SHARED);
if (hc != NULL) {
@@ -568,7 +568,6 @@
#endif
BOOL ret = FALSE;
int flag = 0;
- OSVERSIONINFO osvi;
HANDLE hToken;
DWORD dwLength;
TOKEN_ELEVATION tokenElevation;
@@ -579,10 +578,8 @@
DWORD dwType;
BYTE bValue;
- osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
- GetVersionEx(&osvi);
// Windows Vista\x88ȑO\x82͖\xB3\x8E\x8B\x82\xB7\x82\xE9\x81B
- if (!(osvi.dwPlatformId == VER_PLATFORM_WIN32_NT && osvi.dwMajorVersion >= 6))
+ if (!IsWindowsVistaOrLater())
goto error;
// UAC\x82\xAA\x97L\x8C\xF8\x82\xA9\x82ǂ\xA4\x82\xA9\x81B
@@ -826,7 +823,7 @@
// USB\x83f\x83o\x83C\x83X\x95ω\xBB\x92ʒm\x93o\x98^
RegDeviceNotify(HVTWin);
- if (is_NT4()) {
+ if (IsWindowsNT4()) {
fuLoad = LR_VGACOLOR;
}
::PostMessage(HVTWin,WM_SETICON,ICON_SMALL,
@@ -2703,7 +2700,6 @@
SIZE sz;
RECT wr;
int ix, iy;
- HMODULE mod;
HMONITOR hm;
/* calculate the tip's size */
@@ -2717,8 +2713,7 @@
ix = wr.left;
iy = wr.top - sz.cy;
- if (((mod = GetModuleHandle("user32.dll")) != NULL) &&
- (GetProcAddress(mod,"MonitorFromPoint") != NULL)) {
+ if (HasMultiMonitorSupport()) {
// \x83}\x83\x8B\x83`\x83\x82\x83j\x83^\x82\xAA\x83T\x83|\x81[\x83g\x82\xB3\x82\xEA\x82Ă\xA2\x82\xE9\x8Fꍇ
POINT p;
p.x = ix;
Modified: trunk/teraterm/teraterm/winjump.c
===================================================================
--- trunk/teraterm/teraterm/winjump.c 2016-01-31 14:31:30 UTC (rev 6285)
+++ trunk/teraterm/teraterm/winjump.c 2016-02-01 15:14:14 UTC (rev 6286)
@@ -369,17 +369,7 @@
BOOL isJumpListSupported(void)
{
- static OSVERSIONINFO osVersion;
-
- if (osVersion.dwOSVersionInfoSize != sizeof(OSVERSIONINFO)) {
- osVersion.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
- GetVersionEx(&osVersion);
- }
- if ((osVersion.dwMajorVersion < 6) ||
- (osVersion.dwMajorVersion == 6 && osVersion.dwMinorVersion < 1))
- return FALSE;
- else
- return TRUE;
+ return IsWindows7OrLater();
}
/*
Modified: trunk/teraterm/ttpcmn/ttcmn.c
===================================================================
--- trunk/teraterm/ttpcmn/ttcmn.c 2016-01-31 14:31:30 UTC (rev 6285)
+++ trunk/teraterm/ttpcmn/ttcmn.c 2016-02-01 15:14:14 UTC (rev 6286)
@@ -1059,20 +1059,9 @@
HMONITOR hMonitor;
MONITORINFO mi;
int stat = SW_RESTORE;
- OSVERSIONINFO osvi;
int multi_mon = 0;
- // Windows\x82̃o\x81[\x83W\x83\x87\x83\x93\x82\xF0\x8E擾\x82\xB7\x82\xE9\x81B
- // \x82Ȃ\xA8\x81AWindows8.1\x82ł́AGetVersionEx()\x82\xCDdeprecated API\x82ł\xA0\x82邽\x82߁AWindows8(major=6,minor=2)
- // \x82ƕԂ\xC1\x82Ă\xAD\x82\xE9\x81BManifest\x83t\x83@\x83C\x83\x8B\x82\xF0\x8FC\x90\xB3\x82\xB7\x82\xE9\x82Ƃ\xA2\x82\xA4\x89\xF1\x94\xF0\x95\xFB\x96@\x82\xAA\x82\xA0\x82\xE9\x82悤\x82\xBE\x82\xAA\x81AVisual Studio 2005\x82ł\xCD
- // \x8Eg\x82\xA6\x82Ȃ\xA2\x82\xE0\x82̂Ǝv\x82\xED\x82\xEA\x82\xE9\x81B
- // cf. http://msdn.microsoft.com/en-us/library/windows/desktop/dn302074.aspx
- osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
- GetVersionEx(&osvi);
- if ( (osvi.dwPlatformId == VER_PLATFORM_WIN32_NT && osvi.dwMajorVersion == 4) ||
- (osvi.dwPlatformId == VER_PLATFORM_WIN32_WINDOWS && osvi.dwMinorVersion < 10) ) {
- multi_mon = 0;
- } else {
+ if (HasMultiMonitorSupport()) {
multi_mon = 1;
}
Modified: trunk/teraterm/ttpcmn/ttpcmn.def
===================================================================
--- trunk/teraterm/ttpcmn/ttpcmn.def 2016-01-31 14:31:30 UTC (rev 6285)
+++ trunk/teraterm/ttpcmn/ttpcmn.def 2016-02-01 15:14:14 UTC (rev 6286)
@@ -59,3 +59,13 @@
DequoteParam @63
CheckComPort @64
+
+ IsWindows95 @65
+ IsWindowsNT4 @66
+ IsWindowsNTKernel @67
+ IsWindows2000OrLater @68
+ IsWindowsVistaOrLater @69
+ IsWindows7OrLater @70
+ HasMultiMonitorSupport @71
+ HasGetAdaptersAddresses @72
+ HasDnsQuery @73
Modified: trunk/teraterm/ttpdlg/ttdlg.c
===================================================================
--- trunk/teraterm/ttpdlg/ttdlg.c 2016-01-31 14:31:30 UTC (rev 6285)
+++ trunk/teraterm/ttpdlg/ttdlg.c 2016-02-01 15:14:14 UTC (rev 6286)
@@ -1184,7 +1184,6 @@
char uimsg[MAX_UIMSG], uimsg2[MAX_UIMSG];
LOGFONT logfont;
HFONT font;
- OSVERSIONINFO osvi;
switch (Message) {
case WM_INITDIALOG:
@@ -1255,11 +1254,9 @@
SetRB(Dialog,ts->DisableAppKeypad,IDC_KEYBAPPKEY,IDC_KEYBAPPKEY);
SetRB(Dialog,ts->DisableAppCursor,IDC_KEYBAPPCUR,IDC_KEYBAPPCUR);
- osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
- GetVersionEx(&osvi);
- if (osvi.dwPlatformId == VER_PLATFORM_WIN32_WINDOWS) {
+ if (!IsWindowsNTKernel()) {
SetDropDownList(Dialog, IDC_KEYBMETA, MetaList2, ts->MetaKey + 1);
- }
+ }
else {
SetDropDownList(Dialog, IDC_KEYBMETA, MetaList, ts->MetaKey + 1);
}
@@ -2731,7 +2728,7 @@
int fuLoad = LR_DEFAULTCOLOR;
HICON hicon;
- if (is_NT4()) {
+ if (IsWindowsNT4()) {
fuLoad = LR_VGACOLOR;
}
Modified: trunk/teraterm/ttpfile/kermit.c
===================================================================
--- trunk/teraterm/ttpfile/kermit.c 2016-01-31 14:31:30 UTC (rev 6285)
+++ trunk/teraterm/ttpfile/kermit.c 2016-02-01 15:14:14 UTC (rev 6286)
@@ -1040,12 +1040,12 @@
}
if ( (kv->FileAttrFlag & KMT_ATTR_MODE) != 0 ) {
_snprintf_s(t, sizeof(t), _TRUNCATE, "%03o", kv->FileMode & 0777);
- _snprintf_s(s, sizeof(s), _TRUNCATE, ",%c%s", KmtChar(strlen(t)), t);
+ _snprintf_s(s, sizeof(s), _TRUNCATE, ",%c%s", KmtChar((BYTE)strlen(t)), t);
strncat_s(buf, sizeof(buf), s, _TRUNCATE);
}
if ( (kv->FileAttrFlag & KMT_ATTR_SIZE) != 0 ) {
_snprintf_s(t, sizeof(t), _TRUNCATE, "%I64d", kv->FileSize);
- _snprintf_s(s, sizeof(s), _TRUNCATE, "1%c%s", KmtChar(strlen(t)), t);
+ _snprintf_s(s, sizeof(s), _TRUNCATE, "1%c%s", KmtChar((BYTE)strlen(t)), t);
strncat_s(buf, sizeof(buf), s, _TRUNCATE);
}
Modified: trunk/teraterm/ttpmacro/ttl.c
===================================================================
--- trunk/teraterm/ttpmacro/ttl.c 2016-01-31 14:31:30 UTC (rev 6285)
+++ trunk/teraterm/ttpmacro/ttl.c 2016-02-01 15:14:14 UTC (rev 6286)
@@ -1159,7 +1159,7 @@
return ErrSyntax;
strncpy_s(LineBuff, sizeof(LineBuff),NextLine, _TRUNCATE);
- LineLen = strlen(LineBuff);
+ LineLen = (WORD)strlen(LineBuff);
LinePtr = 0;
b = GetFirstChar();
LinePtr--;
@@ -2386,7 +2386,6 @@
IP_ADAPTER_ADDRESSES addr[256];/* XXX */
ULONG len = sizeof(addr);
char ipv6str[64];
- OSVERSIONINFO osvi;
Err = 0;
GetStrAryVar(&VarId,&Err);
@@ -2395,12 +2394,8 @@
Err = ErrSyntax;
if (Err!=0) return Err;
- // IPv6 \x82\xAA\x83T\x83|\x81[\x83g\x82\xB3\x82\xEA\x82Ă\xA2\x82Ȃ\xA2 OS \x82͂\xB1\x82\xB1\x82\xC5 return
- osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
- GetVersionEx(&osvi);
- if ( osvi.dwPlatformId == VER_PLATFORM_WIN32_WINDOWS ||
- (osvi.dwPlatformId == VER_PLATFORM_WIN32_NT && osvi.dwMajorVersion == 4) ) {
- // 9x, NT4.0 \x82\xCD IPv6 \x94\xF1\x91Ή\x9E
+ // GetAdaptersAddresses \x82\xAA\x83T\x83|\x81[\x83g\x82\xB3\x82\xEA\x82Ă\xA2\x82Ȃ\xA2 OS \x82͂\xB1\x82\xB1\x82\xC5 return
+ if (!HasGetAdaptersAddresses()) {
SetResult(-1);
SetIntVal(VarId2, 0);
return Err;
Modified: trunk/teraterm/ttpmacro/ttmbuff.c
===================================================================
--- trunk/teraterm/ttpmacro/ttmbuff.c 2016-01-31 14:31:30 UTC (rev 6285)
+++ trunk/teraterm/ttpmacro/ttmbuff.c 2016-02-01 15:14:14 UTC (rev 6286)
@@ -268,7 +268,7 @@
b = (Buff[INest])[BuffPtr[INest]];
}
LinePtr = 0;
- LineLen = strlen(LineBuff);
+ LineLen = (WORD)strlen(LineBuff);
LineParsePtr = 0;
// current line number (2005.7.18 yutaka)
Modified: trunk/teraterm/ttpmacro/ttmlib.c
===================================================================
--- trunk/teraterm/ttpmacro/ttmlib.c 2016-01-31 14:31:30 UTC (rev 6285)
+++ trunk/teraterm/ttpmacro/ttmlib.c 2016-02-01 15:14:14 UTC (rev 6286)
@@ -126,23 +126,9 @@
int DoGetSpecialFolder(int CSIDL, PCHAR dest, int dest_len)
{
- OSVERSIONINFO osvi;
char Path[MAX_PATH] = "";
LPITEMIDLIST pidl;
- osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
- GetVersionEx(&osvi);
- if ( (osvi.dwPlatformId == VER_PLATFORM_WIN32_NT && osvi.dwMajorVersion == 4) ||
- (osvi.dwPlatformId == VER_PLATFORM_WIN32_WINDOWS) ) {
- switch (CSIDL) {
- case CSIDL_COMMON_DESKTOPDIRECTORY:
- case CSIDL_COMMON_STARTMENU:
- case CSIDL_COMMON_PROGRAMS:
- case CSIDL_COMMON_STARTUP:
- return 0;
- }
- }
-
if (SHGetSpecialFolderLocation(NULL, CSIDL, &pidl) != S_OK) {
return 0;
}
@@ -168,12 +154,7 @@
int GetMonitorLeftmost(int PosX, int PosY)
{
- OSVERSIONINFO osvi;
-
- osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
- GetVersionEx(&osvi);
- if ( (osvi.dwPlatformId == VER_PLATFORM_WIN32_NT && osvi.dwMajorVersion == 4) ||
- (osvi.dwPlatformId == VER_PLATFORM_WIN32_WINDOWS && osvi.dwMinorVersion < 10) ) {
+ if (!HasMultiMonitorSupport()) {
// // NT4.0, 95 \x82̓}\x83\x8B\x83`\x83\x82\x83j\x83^API\x82ɔ\xF1\x91Ή\x9E
return 0;
}
Modified: trunk/teraterm/ttpmacro/ttmmain.cpp
===================================================================
--- trunk/teraterm/ttpmacro/ttmmain.cpp 2016-01-31 14:31:30 UTC (rev 6285)
+++ trunk/teraterm/ttpmacro/ttmmain.cpp 2016-02-01 15:14:14 UTC (rev 6286)
@@ -252,7 +252,7 @@
(CRTHeight-Rect.bottom+Rect.top) / 2,
0,0,SWP_NOSIZE | SWP_NOZORDER);
- if (is_NT4()) {
+ if (IsWindowsNT4()) {
fuLoad = LR_VGACOLOR;
}
::PostMessage(GetSafeHwnd(),WM_SETICON,ICON_SMALL,
Modified: trunk/teraterm/ttpset/ttset.c
===================================================================
--- trunk/teraterm/ttpset/ttset.c 2016-01-31 14:31:30 UTC (rev 6285)
+++ trunk/teraterm/ttpset/ttset.c 2016-02-01 15:14:14 UTC (rev 6286)
@@ -488,7 +488,6 @@
int i;
HDC TmpDC;
char Temp[MAX_PATH], Temp2[MAX_PATH];
- OSVERSIONINFO osvi;
ts->Minimize = 0;
ts->HideWindow = 0;
@@ -505,9 +504,6 @@
ts->DisableTCPEchoCR = FALSE;
- osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
- GetVersionEx(&osvi);
-
/* Version number */
/* GetPrivateProfileString(Section,"Version","",
Temp,sizeof(Temp),FName); */
@@ -933,7 +929,7 @@
ts->MetaKey = IdMetaOff;
// Windows95 \x8Cn\x82͍\xB6\x89E\x82\xCC Alt \x82̔\xBB\x95ʂɔ\xF1\x91Ή\x9E
- if ((osvi.dwPlatformId == VER_PLATFORM_WIN32_WINDOWS) && ts->MetaKey != IdMetaOff) {
+ if (!IsWindowsNTKernel() && ts->MetaKey != IdMetaOff) {
ts->MetaKey = IdMetaOn;
}
@@ -3092,7 +3088,7 @@
Num = 0xFFFF;
else if (_stricmp(Temp, "off") == 0)
Num = 0xFFFF;
- else if (sscanf(Temp, "%d", &Num) != 1)
+ else if (sscanf(Temp, "%hd", &Num) != 1)
Num = 0xFFFF;
KeyMap->Map[KeyId - 1] = Num;
@@ -3567,7 +3563,7 @@
} while (b != '\0' && b != ':');
if (b == ':') {
s[i - 1] = '\0';
- if (sscanf(&(s[i]), "%d", port) != 1)
+ if (sscanf(&(s[i]), "%hd", port) != 1)
*port = 65535;
is_port = 1;
}
@@ -3774,7 +3770,7 @@
}
else if (_strnicmp(Temp, "/P=", 3) == 0) { /* TCP port num */
ParamPort = IdTCPIP;
- if (sscanf(&Temp[3], "%d", &ParamTCP) != 1)
+ if (sscanf(&Temp[3], "%hd", &ParamTCP) != 1)
ParamTCP = 65535;
}
else if (_strnicmp(Temp, "/R=", 3) == 0) { /* Replay filename */
Property changes on: trunk/ttpmenu
___________________________________________________________________
Modified: svn:mergeinfo
-
+ /branches/vs2015_warn/ttpmenu:6194-6285
Modified: trunk/ttpmenu/ttpmenu.cpp
===================================================================
--- trunk/ttpmenu/ttpmenu.cpp 2016-01-31 14:31:30 UTC (rev 6285)
+++ trunk/ttpmenu/ttpmenu.cpp 2016-02-01 15:14:14 UTC (rev 6286)
@@ -2645,7 +2645,7 @@
g_hI = hI;
- if (is_NT4()){
+ if (IsWindowsNT4()){
fuLoad = LR_VGACOLOR;
}
g_hIcon = (HICON)::LoadImage(g_hI, MAKEINTRESOURCE(TTERM_ICON), IMAGE_ICON, 32, 32, fuLoad);
Modified: trunk/ttssh2/matcher/matcher.v11.vcxproj
===================================================================
--- trunk/ttssh2/matcher/matcher.v11.vcxproj 2016-01-31 14:31:30 UTC (rev 6285)
+++ trunk/ttssh2/matcher/matcher.v11.vcxproj 2016-02-01 15:14:14 UTC (rev 6286)
@@ -74,6 +74,7 @@
<SuppressStartupBanner>true</SuppressStartupBanner>
<SubSystem>Console</SubSystem>
<TargetMachine>MachineX86</TargetMachine>
+ <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
Modified: trunk/ttssh2/matcher/matcher.v12.vcxproj
===================================================================
--- trunk/ttssh2/matcher/matcher.v12.vcxproj 2016-01-31 14:31:30 UTC (rev 6285)
+++ trunk/ttssh2/matcher/matcher.v12.vcxproj 2016-02-01 15:14:14 UTC (rev 6286)
@@ -74,6 +74,7 @@
<SuppressStartupBanner>true</SuppressStartupBanner>
<SubSystem>Console</SubSystem>
<TargetMachine>MachineX86</TargetMachine>
+ <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
Modified: trunk/ttssh2/matcher/matcher.v14.vcxproj
===================================================================
--- trunk/ttssh2/matcher/matcher.v14.vcxproj 2016-01-31 14:31:30 UTC (rev 6285)
+++ trunk/ttssh2/matcher/matcher.v14.vcxproj 2016-02-01 15:14:14 UTC (rev 6286)
@@ -98,6 +98,7 @@
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
<TargetMachine>MachineX86</TargetMachine>
+ <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
Modified: trunk/ttssh2/puttyrev/puttyrev.v11.vcxproj
===================================================================
--- trunk/ttssh2/puttyrev/puttyrev.v11.vcxproj 2016-01-31 14:31:30 UTC (rev 6285)
+++ trunk/ttssh2/puttyrev/puttyrev.v11.vcxproj 2016-02-01 15:14:14 UTC (rev 6286)
@@ -68,6 +68,7 @@
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
<TargetMachine>MachineX86</TargetMachine>
+ <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
Modified: trunk/ttssh2/puttyrev/puttyrev.v12.vcxproj
===================================================================
--- trunk/ttssh2/puttyrev/puttyrev.v12.vcxproj 2016-01-31 14:31:30 UTC (rev 6285)
+++ trunk/ttssh2/puttyrev/puttyrev.v12.vcxproj 2016-02-01 15:14:14 UTC (rev 6286)
@@ -68,6 +68,7 @@
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
<TargetMachine>MachineX86</TargetMachine>
+ <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
Modified: trunk/ttssh2/puttyrev/puttyrev.v14.vcxproj
===================================================================
--- trunk/ttssh2/puttyrev/puttyrev.v14.vcxproj 2016-01-31 14:31:30 UTC (rev 6285)
+++ trunk/ttssh2/puttyrev/puttyrev.v14.vcxproj 2016-02-01 15:14:14 UTC (rev 6286)
@@ -68,6 +68,7 @@
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
<TargetMachine>MachineX86</TargetMachine>
+ <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
Modified: trunk/ttssh2/ttssh/ttssh.v11.vcxproj
===================================================================
--- trunk/ttssh2/ttssh/ttssh.v11.vcxproj 2016-01-31 14:31:30 UTC (rev 6285)
+++ trunk/ttssh2/ttssh/ttssh.v11.vcxproj 2016-02-01 15:14:14 UTC (rev 6286)
@@ -75,6 +75,7 @@
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<TargetMachine>MachineX86</TargetMachine>
+ <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
Modified: trunk/ttssh2/ttssh/ttssh.v12.vcxproj
===================================================================
--- trunk/ttssh2/ttssh/ttssh.v12.vcxproj 2016-01-31 14:31:30 UTC (rev 6285)
+++ trunk/ttssh2/ttssh/ttssh.v12.vcxproj 2016-02-01 15:14:14 UTC (rev 6286)
@@ -75,6 +75,7 @@
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<TargetMachine>MachineX86</TargetMachine>
+ <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
Modified: trunk/ttssh2/ttssh/ttssh.v14.vcxproj
===================================================================
--- trunk/ttssh2/ttssh/ttssh.v14.vcxproj 2016-01-31 14:31:30 UTC (rev 6285)
+++ trunk/ttssh2/ttssh/ttssh.v14.vcxproj 2016-02-01 15:14:14 UTC (rev 6286)
@@ -75,6 +75,7 @@
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<TargetMachine>MachineX86</TargetMachine>
+ <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
Modified: trunk/ttssh2/ttxssh/dns.c
===================================================================
--- trunk/ttssh2/ttxssh/dns.c 2016-01-31 14:31:30 UTC (rev 6285)
+++ trunk/ttssh2/ttxssh/dns.c 2016-02-01 15:14:14 UTC (rev 6286)
@@ -60,11 +60,8 @@
digest_algorithm dgst_alg;
BYTE *hostkey_digest = NULL;
int found = DNS_VERIFY_NOTFOUND;
- OSVERSIONINFO osvi;
- osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
- GetVersionEx(&osvi);
- if (osvi.dwMajorVersion < 5) {
+ if (!HasDnsQuery()) {
// DnsQuery \x82\xCD Windows 2000 \x88ȏ\xE3\x82ł\xB5\x82\xA9\x93\xAE\x8D삵\x82Ȃ\xA2\x82\xBD\x82\xDF
return DNS_VERIFY_NONE;
}
Modified: trunk/ttssh2/ttxssh/ed25519_bcrypt_pbkdf.c
===================================================================
--- trunk/ttssh2/ttxssh/ed25519_bcrypt_pbkdf.c 2016-01-31 14:31:30 UTC (rev 6285)
+++ trunk/ttssh2/ttxssh/ed25519_bcrypt_pbkdf.c 2016-02-01 15:14:14 UTC (rev 6286)
@@ -76,10 +76,10 @@
/* key expansion */
Blowfish_initstate(&state);
- Blowfish_expandstate(&state, sha2salt, shalen, sha2pass, shalen);
+ Blowfish_expandstate(&state, sha2salt, (u_int16_t)shalen, sha2pass, (u_int16_t)shalen);
for (i = 0; i < 64; i++) {
- Blowfish_expand0state(&state, sha2salt, shalen);
- Blowfish_expand0state(&state, sha2pass, shalen);
+ Blowfish_expand0state(&state, sha2salt, (u_int16_t)shalen);
+ Blowfish_expand0state(&state, sha2pass, (u_int16_t)shalen);
}
/* encryption */
Modified: trunk/ttssh2/ttxssh/key.c
===================================================================
--- trunk/ttssh2/ttxssh/key.c 2016-01-31 14:31:30 UTC (rev 6285)
+++ trunk/ttssh2/ttxssh/key.c 2016-02-01 15:14:14 UTC (rev 6286)
@@ -822,8 +822,8 @@
}
/* mark starting point and end point*/
- field[FLDSIZE_X / 2][FLDSIZE_Y / 2] = len - 1;
- field[x][y] = len;
+ field[FLDSIZE_X / 2][FLDSIZE_Y / 2] = (unsigned char)(len - 1);
+ field[x][y] = (unsigned char)len;
/* assemble title */
r = _snprintf_s(title, sizeof(title), _TRUNCATE, "[%s %u]",
Modified: trunk/ttssh2/ttxssh/ttxssh.c
===================================================================
--- trunk/ttssh2/ttxssh/ttxssh.c 2016-01-31 14:31:30 UTC (rev 6285)
+++ trunk/ttssh2/ttxssh/ttxssh.c 2016-02-01 15:14:14 UTC (rev 6286)
@@ -830,7 +830,7 @@
{
int fuLoad = LR_DEFAULTCOLOR;
- if (is_NT4()) {
+ if (IsWindowsNT4()) {
fuLoad = LR_VGACOLOR;
}
@@ -2930,7 +2930,7 @@
int fuLoad = LR_DEFAULTCOLOR;
HICON hicon;
- if (is_NT4()) {
+ if (IsWindowsNT4()) {
fuLoad = LR_VGACOLOR;
}
Modified: trunk/ttssh2/ttxssh/ttxssh.h
===================================================================
--- trunk/ttssh2/ttxssh/ttxssh.h 2016-01-31 14:31:30 UTC (rev 6285)
+++ trunk/ttssh2/ttxssh/ttxssh.h 2016-02-01 15:14:14 UTC (rev 6286)
@@ -36,6 +36,16 @@
#pragma warning(3 : 4035)
+/* VS2015(VC14.0)\x82\xBE\x82ƁAWSASocketA(), inet_ntoa() \x82Ȃǂ\xCCAPI\x82\xAAdeprecated\x82ł\xA0\x82\xE9\x82\xC6
+* \x8Cx\x8D\x90\x82\xB7\x82邽\x82߂ɁA\x8Cx\x8D\x90\x82\xF0\x97}\x8E~\x82\xB7\x82\xE9\x81B\x91\xE3\x91֊\x94\x82ɒu\x8A\xB7\x82\xB7\x82\xE9\x82ƁAVS2005(VC8.0)\x82Ńr\x83\x8B\x83h
+* \x82ł\xAB\x82Ȃ\xAD\x82Ȃ邽\x82߁A\x8Cx\x8D\x90\x82\xF0\x97}\x8E~\x82\xB7\x82邾\x82\xAF\x82Ƃ\xB7\x82\xE9\x81B
+*/
+#if _MSC_VER >= 1800 // VSC2013(VC12.0) or later
+ #ifndef _WINSOCK_DEPRECATED_NO_WARNINGS
+ #define _WINSOCK_DEPRECATED_NO_WARNINGS
+ #endif
+#endif
+
#ifndef NO_INET6
#include <winsock2.h>
#include <ws2tcpip.h>
Modified: trunk/ttssh2/ttxssh/ttxssh.v11.vcxproj
===================================================================
--- trunk/ttssh2/ttxssh/ttxssh.v11.vcxproj 2016-01-31 14:31:30 UTC (rev 6285)
+++ trunk/ttssh2/ttxssh/ttxssh.v11.vcxproj 2016-02-01 15:14:14 UTC (rev 6286)
@@ -95,6 +95,7 @@
<BaseAddress>0x12500000</BaseAddress>
<ImportLibrary>$(OutDir)$(ProjectName).lib</ImportLibrary>
<TargetMachine>MachineX86</TargetMachine>
+ <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
Modified: trunk/ttssh2/ttxssh/ttxssh.v12.vcxproj
===================================================================
--- trunk/ttssh2/ttxssh/ttxssh.v12.vcxproj 2016-01-31 14:31:30 UTC (rev 6285)
+++ trunk/ttssh2/ttxssh/ttxssh.v12.vcxproj 2016-02-01 15:14:14 UTC (rev 6286)
@@ -95,6 +95,7 @@
<BaseAddress>0x12500000</BaseAddress>
<ImportLibrary>$(OutDir)$(ProjectName).lib</ImportLibrary>
<TargetMachine>MachineX86</TargetMachine>
+ <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
Modified: trunk/ttssh2/ttxssh/ttxssh.v14.vcxproj
===================================================================
--- trunk/ttssh2/ttxssh/ttxssh.v14.vcxproj 2016-01-31 14:31:30 UTC (rev 6285)
+++ trunk/ttssh2/ttxssh/ttxssh.v14.vcxproj 2016-02-01 15:14:14 UTC (rev 6286)
@@ -95,6 +95,7 @@
<BaseAddress>0x12500000</BaseAddress>
<ImportLibrary>$(OutDir)$(ProjectName).lib</ImportLibrary>
<TargetMachine>MachineX86</TargetMachine>
+ <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">