svnno****@sourc*****
svnno****@sourc*****
2017年 7月 5日 (水) 00:01:52 JST
Revision: 6837 http://sourceforge.jp/projects/ttssh2/scm/svn/commits/6837 Author: doda Date: 2017-07-05 00:01:52 +0900 (Wed, 05 Jul 2017) Log Message: ----------- バージョン情報をヘッダファイルへ移動 (Tera Term 本体分) ・ttermpro.rc, ttpmacro.rc からバージョン情報を別ファイルに分離した ・共有メモリの名前にバージョン番号を含めるようにした ・Tera Term 本体のバージョン番号の取得を、定義したマクロを使うようにした 検討事項: ・マクロ getver は未だ ttermpro.exe から取得している。これは変更すべき? - ttermpro.exe と ttpmacro.exe が違うバージョンの時に動作が変わる ⇒ そのような状況はサポート対象外なので、考慮する必要なし? - そもそも getver はどちらのバージョンを返すべき? ⇒ 大抵の場合はマクロコマンドの利用可否の判別だろうから ttpmacro.exe の バージョンの方が正しい? ・tt-version.h の場所、および所属プロジェクトは? - 場所は Tera Term 本体, ttpmacro の両方が参照するという事で common でいい? - プロジェクトは、現在は teraterm.h, tttypes.h と同じという事で ttpset に している。他の候補は * 共通ファイルという事で ttpcmn * ttdlg.c から参照するので ttpdlg * Tera Term のバージョンという事で teraterm ・About ダイアログで svn revision を表示しているが、Release No. または Build No. 辺りに埋め込めば起動せずに確認できるので便利? ⇒ Release No. と Build No. ではどっちがいい? ・現在は ttpcmn.dll 等の dll, keycode.exe にはバージョン情報が無いが、 これらにも付加した方がよくないか? ・tt(m)-version.rc は手動更新のみなので出来るだけ変更を行わなくしたい。 現状、著作権表記を毎年書き換える事になるが、更新年の部分だけでもヘッダに 移動するべき? 他の dll 等にもバージョン情報を付けると変更対象が多くなるのでやるべき? どうせ機械的に一括で書き換えるのでそこまでする必要はない? Modified Paths: -------------- trunk/teraterm/common/tttypes.h trunk/teraterm/teraterm/ttermpro.rc trunk/teraterm/teraterm/ttermpro.v10.vcxproj trunk/teraterm/teraterm/ttermpro.v10.vcxproj.filters trunk/teraterm/teraterm/ttermpro.v11.vcxproj trunk/teraterm/teraterm/ttermpro.v11.vcxproj.filters trunk/teraterm/teraterm/ttermpro.v12.vcxproj trunk/teraterm/teraterm/ttermpro.v12.vcxproj.filters trunk/teraterm/teraterm/ttermpro.v14.vcxproj trunk/teraterm/teraterm/ttermpro.v14.vcxproj.filters trunk/teraterm/teraterm/ttermpro.v15.vcxproj trunk/teraterm/teraterm/ttermpro.v15.vcxproj.filters trunk/teraterm/teraterm/ttermpro.v9.vcproj trunk/teraterm/teraterm/ttermpro.vcproj trunk/teraterm/ttpdlg/ttdlg.c trunk/teraterm/ttpdlg/ttpdlg.v10.vcxproj trunk/teraterm/ttpdlg/ttpdlg.v11.vcxproj trunk/teraterm/ttpdlg/ttpdlg.v12.vcxproj trunk/teraterm/ttpdlg/ttpdlg.v14.vcxproj trunk/teraterm/ttpdlg/ttpdlg.v15.vcxproj trunk/teraterm/ttpdlg/ttpdlg.v9.vcproj trunk/teraterm/ttpdlg/ttpdlg.vcproj trunk/teraterm/ttpmacro/ttpmacro.rc trunk/teraterm/ttpmacro/ttpmacro.v10.vcxproj trunk/teraterm/ttpmacro/ttpmacro.v10.vcxproj.filters trunk/teraterm/ttpmacro/ttpmacro.v11.vcxproj trunk/teraterm/ttpmacro/ttpmacro.v11.vcxproj.filters trunk/teraterm/ttpmacro/ttpmacro.v12.vcxproj trunk/teraterm/ttpmacro/ttpmacro.v12.vcxproj.filters trunk/teraterm/ttpmacro/ttpmacro.v14.vcxproj trunk/teraterm/ttpmacro/ttpmacro.v14.vcxproj.filters trunk/teraterm/ttpmacro/ttpmacro.v15.vcxproj trunk/teraterm/ttpmacro/ttpmacro.v15.vcxproj.filters trunk/teraterm/ttpmacro/ttpmacro.v9.vcproj trunk/teraterm/ttpmacro/ttpmacro.vcproj trunk/teraterm/ttpset/ttpset.v10.vcxproj trunk/teraterm/ttpset/ttpset.v10.vcxproj.filters trunk/teraterm/ttpset/ttpset.v11.vcxproj trunk/teraterm/ttpset/ttpset.v11.vcxproj.filters trunk/teraterm/ttpset/ttpset.v12.vcxproj trunk/teraterm/ttpset/ttpset.v12.vcxproj.filters trunk/teraterm/ttpset/ttpset.v14.vcxproj trunk/teraterm/ttpset/ttpset.v14.vcxproj.filters trunk/teraterm/ttpset/ttpset.v15.vcxproj trunk/teraterm/ttpset/ttpset.v15.vcxproj.filters trunk/teraterm/ttpset/ttpset.v9.vcproj trunk/teraterm/ttpset/ttpset.vcproj Added Paths: ----------- trunk/teraterm/common/tt-version.h trunk/teraterm/teraterm/tt-version.rc trunk/teraterm/ttpmacro/ttm-version.rc -------------- next part -------------- Added: trunk/teraterm/common/tt-version.h =================================================================== --- trunk/teraterm/common/tt-version.h (rev 0) +++ trunk/teraterm/common/tt-version.h 2017-07-04 15:01:52 UTC (rev 6837) @@ -0,0 +1,36 @@ +/* + * Copyright (C) 2017 TeraTerm Project + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#pragma once + +#define TT_VERSION_MAJOR 4 +#define TT_VERSION_MINOR 95 +#define TT_TOSTR(x) TT_TOSTR2(x) +#define TT_TOSTR2(x) #x +#define TT_VERSION_STR(sep) TT_TOSTR(TT_VERSION_MAJOR) sep TT_TOSTR(TT_VERSION_MINOR) +#define TT_RES_VERSION_STR TT_VERSION_STR(", ") ", 0, 0" Modified: trunk/teraterm/common/tttypes.h =================================================================== --- trunk/teraterm/common/tttypes.h 2017-07-04 15:01:46 UTC (rev 6836) +++ trunk/teraterm/common/tttypes.h 2017-07-04 15:01:52 UTC (rev 6837) @@ -28,6 +28,7 @@ /* Constants and types for Tera Term */ #include <locale.h> #include "teraterm.h" +#include "tt-version.h" #define IdBreakTimer 1 #define IdDelayTimer 2 @@ -1096,194 +1097,7 @@ } TMap; typedef TMap far *PMap; - -/* - * Increment the number of this macro value - * when you change TMap or member of TMap. - * - * - At version 4.96, ttset_memfilemap was replaced with ttset_memfilemap_32. - * added tttset.LogTimestampFormat - * added tttset.LogTimestampUTC - * - * - At version 4.95, ttset_memfilemap was replaced with ttset_memfilemap_31. - * added tttset.NotifyClipboardAccess - * - * - At version 4.94, ttset_memfilemap was replaced with ttset_memfilemap_30. - * paste related settings are integrated into tttset.PasteFlag - * - * - At version 4.92, ttset_memfilemap was replaced with ttset_memfilemap_29. - * added tttset.TrimTrailingNLonPaste - * - * - At version 4.91, ttset_memfilemap was replaced with ttset_memfilemap_28. - * added tttset.WaitCom - * - * - At version 4.90, ttset_memfilemap was replaced with ttset_memfilemap_27. - * added tttset.XmodemTimeOutInit - * added tttset.XmodemTimeOutInitCRC - * added tttset.XmodemTimeOutShort - * added tttset.XmodemTimeOutLong - * added tttset.XmodemTimeOutVLong - * added tttset.YmodemTimeOutInit - * added tttset.YmodemTimeOutInitCRC - * added tttset.YmodemTimeOutShort - * added tttset.YmodemTimeOutLong - * added tttset.YmodemTimeOutVLong - * added tttset.ZmodemTimeOutNormal - * added tttset.ZmodemTimeOutTCPIP - * added tttset.ZmodemTimeOutInit - * added tttset.ZmodemTimeOutFin - * - * - At version 4.89, ttset_memfilemap was replaced with ttset_memfilemap_26. - * added tttset.FileSendHighSpeedMode - * added tttset.AutoComPortReconnect - * added tttset.BGImgBrightness - * added tttset.CygtermSettings - * - * - At version 4.85, ttset_memfilemap was replaced with ttset_memfilemap_25. - * added tttset.AcceleratorNewConnection - * added tttset.AcceleratorCygwinConnection - * added tttset.SendBreakTime - * - * - At version 4.83, ttset_memfilemap was replaced with ttset_memfilemap_24. - * added tttset.DebugModes - * - * - At version 4.82, ttset_memfilemap was replaced with ttset_memfilemap_23. - * added tttset.MulticastName - * - * - At version 4.80, ttset_memfilemap was replaced with ttset_memfilemap_22. - * added tttset.LogAllBuffIncludedInFirst - * added tttset.MaxOSCBufferSize - * added tttset.JoinSplitURL - * added tttset.JoinSplitURLIgnoreEOLChar - * - * - At version 4.79, ttset_memfilemap was replaced with ttset_memfilemap_21. - * added TMap.WinUndoFlag - * added tttset.FTHideDialog - * added tttset.BeepOverUsedCount - * added tttset.BeepOverUsedTime - * added tttset.BeepSuppressTime - * - * - At version 4.78, ttset_memfilemap was replaced with ttset_memfilemap_20. - * added tttset.LogRotate - * added tttset.LogRotateSize - * added tttset.LogRotateSizeType - * added tttset.LogRotateStep - * added tttset.DeferredLogWriteMode - * added TMap.WinPrevRect - * - * - At version 4.74, ttset_memfilemap was replaced with ttset_memfilemap_19. - * added tttset.FontQuality - * added tttset.ScpSenDir - * added tttset.BGImageFilePath - * - * - At version 4.73, ttset_memfilemap was replaced with ttset_memfilemap_18. - * added tttset.LogLockExclusive - * added tttset.KermitOpt - * - * - At version 4.72, ttset_memfilemap was replaced with ttset_memfilemap_17. - * added tttset.TabStopFlag. - * added tttset.CtrlFlag. - * added tttset.ClickableUrlBrowser. - * added tttset.ClickableUrlBrowserArg. - * added XBackTab Key ID. - * Key ID renumbered. - * - * - At version 4.70, ttset_memfilemap was replaced with ttset_memfilemap_16. - * added tttset.JumpList. - * - * - At version 4.69, ttset_memfilemap was replaced with ttset_memfilemap_15. - * added tttset.TerminalUID. - * added tttset.ConfirmChangePasteCR. - * - * - At version 4.68, ttset_memfilemap was replaced with ttset_memfilemap_14. - * increase WinList(MAXNWIN) size. - * - * - At version 4.67, ttset_memfilemap was replaced with ttset_memfilemap_13. - * added NextShownWin/PrevShownWin shortcut key. - * added tttset.DisableMenuDuplicateSession. - * added tttset.DisableMenuNewConnection. - * added tttset.IMERelatedCursorStyle. - * changed size of tttset.SetupFName to MAX_PATH from MAXPATHLEN. - * changed size of tttset.KeyCnfFN to MAX_PATH from MAXPATHLEN. - * changed size of tttset.LogFN to MAX_PATH from MAXPATHLEN. - * changed size of tttset.MacroFN to MAX_PATH from MAXPATHLEN. - * - * - At version 4.66, ttset_memfilemap was replaced with ttset_memfilemap_12. - * renamed tttset.Baud to Baud_. - * added tttset.Baud. - * added tttset.LogBinary. - * - * - At version 4.63, ttset_memfilemap was replaced with ttset_memfilemap_11. - * added tttset.Wait4allMacroCommand. - * added tttset.DisableAcceleratorMenu. - * added tttset.ClearScreenOnCloseConnection. - * added tttset.DisableAcceleratorDuplicateSession. - * added tttset.PasteDelayPerLine. - * added tttset.FontScaling. - * added tttset.Meta8Bit. - * added tttset.WindowFlag. - * added tttset.EnableLineMode - * added tttset.ConfirmChangePasteStringFile - * - * - At version 4.62, ttset_memfilemap was replaced with ttset_memfilemap_10. - * added tttset.DisableMouseTrackingByCtrl. - * added tttset.DisableWheelToCursorByCtrl. - * added tttset.VTReverseColor[]. etc. - * added tttset.StrictKeyMapping. - * - * - At version 4.61, ttset_memfilemap was replaced with ttset_memfilemap_9. - * added TComVar.TitleRemote. - * - * - At version 4.60, ttset_memfilemap was replaced with ttset_memfilemap_8. - * added tttset.AcceptTitleChangeRequest. - * added tttset.PasteDialogSize. - * - * - At version 4.59, ttset_memfilemap was replaced with ttset_memfilemap_7. - * added tttset.DisablePasteMouseMButton. - * added tttset.MouseWheelScrollLine. - * added tttset.CRSend_ini. - * added tttset.LocalEcho_ini. - * added tttset.UnicodeDecSpMapping. - * added tttset.VTIcon. - * added tttset.TEKIcon. - * added tttset.ScrollWindowClearScreen. - * added tttset.AutoScrollOnlyInBottomLine. - * added tttset.UnknownUnicodeCharaAsWide. - * added tttset.YModemRcvCommand. - * - * - At version 4.58, ttset_memfilemap was replaced with ttset_memfilemap_6. - * added tttset.TranslateWheelToCursor. - * added tttset.HostDialogOnStartup. - * added tttset.MouseEventTracking. - * added tttset.KillFocusCursor. - * added tttset.LogHideDialog. - * added tttset.TerminalOldWidth. - * added tttset.TerminalOldHeight. - * added tttset.MaximizeBugTweak. - * added tttset.ConfirmChangePaste. - * added tttset.SaveVTWinPos. - * - * - At version 4.57, ttset_memfilemap was replaced with ttset_memfilemap_5. - * added tttset.XModemRcvCommand. - * added tttset.ZModemRcvCommand. - * added tttset.ConfirmFileDragAndDrop. - * - * - At version 4.56, ttset_memfilemap was replaced with ttset_memfilemap_4. - * added tttset.DisableAppKeypad. - * added tttset.DisableAppCursor. - * added tttset.ClearComBuffOnOpen. - * added tttset.Send8BitCtrl. - * added tttset.UILanguageFile_ini. - * added tttset.SelectOnlyByLButton. - * added tttset.TelAutoDetect. - * - * - At version 4.54, ttset_memfilemap was replaced with ttset_memfilemap_3. - * added tttset.TelKeepAliveInterval. - * added tttset.MaxBroadcatHistory. - * changed pm.ComFlag type. - * - * - At version 4.53, ttset_memfilemap was replaced with ttset_memfilemap_2. - * added tttset.VTCompatTab. - */ - -#define TT_FILEMAPNAME "ttset_memfilemap_32" +// 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 +#define TT_FILEMAPNAME "ttset_memfilemap_" TT_VERSION_STR("_") Added: trunk/teraterm/teraterm/tt-version.rc =================================================================== --- trunk/teraterm/teraterm/tt-version.rc (rev 0) +++ trunk/teraterm/teraterm/tt-version.rc 2017-07-04 15:01:52 UTC (rev 6837) @@ -0,0 +1,39 @@ +///////////////////////////////////////////////////////////////////////////// +// +// Version +// + +#include "tt-version.h" + +VS_VERSION_INFO VERSIONINFO + FILEVERSION TT_VERSION_MAJOR,TT_VERSION_MINOR,0,0 + PRODUCTVERSION TT_VERSION_MAJOR,TT_VERSION_MINOR,0,0 + FILEFLAGSMASK 0x3fL +#ifdef _DEBUG + FILEFLAGS 0x1L +#else + FILEFLAGS 0x0L +#endif + FILEOS 0x4L + FILETYPE 0x1L + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904b0" + BEGIN + VALUE "CompanyName", "T. Teranishi, TeraTerm Project" + VALUE "FileDescription", "Tera Term" + VALUE "FileVersion", TT_RES_VERSION_STR + VALUE "InternalName", "TTERMPRO" + VALUE "LegalCopyright", "Copyright (C) 1994-1998 T. Teranishi, (C) 2004-2017 TeraTerm Project" + VALUE "OriginalFilename", "TTERMPRO.EXE" + VALUE "ProductName", "Tera Term" + VALUE "ProductVersion", TT_RES_VERSION_STR + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1200 + END +END Modified: trunk/teraterm/teraterm/ttermpro.rc =================================================================== --- trunk/teraterm/teraterm/ttermpro.rc 2017-07-04 15:01:46 UTC (rev 6836) +++ trunk/teraterm/teraterm/ttermpro.rc 2017-07-04 15:01:52 UTC (rev 6837) @@ -438,7 +438,7 @@ 3 TEXTINCLUDE BEGIN - "\r\n" + "#include ""tt-version.rc""\r\n" "\0" END @@ -463,45 +463,6 @@ ///////////////////////////////////////////////////////////////////////////// // -// Version -// - -VS_VERSION_INFO VERSIONINFO - FILEVERSION 4,95,0,0 - PRODUCTVERSION 4,95,0,0 - FILEFLAGSMASK 0x3fL -#ifdef _DEBUG - FILEFLAGS 0x1L -#else - FILEFLAGS 0x0L -#endif - FILEOS 0x4L - FILETYPE 0x1L - FILESUBTYPE 0x0L -BEGIN - BLOCK "StringFileInfo" - BEGIN - BLOCK "040904b0" - BEGIN - VALUE "CompanyName", "T. Teranishi, TeraTerm Project" - VALUE "FileDescription", "Tera Term" - VALUE "FileVersion", "4, 95, 0, 0" - VALUE "InternalName", "TTERMPRO" - VALUE "LegalCopyright", "Copyright (C) 1994-1998 T. Teranishi, (C) 2004-2017 TeraTerm Project" - VALUE "OriginalFilename", "TTERMPRO.EXE" - VALUE "ProductName", "Tera Term" - VALUE "ProductVersion", "4, 95, 0, 0" - END - END - BLOCK "VarFileInfo" - BEGIN - VALUE "Translation", 0x409, 1200 - END -END - - -///////////////////////////////////////////////////////////////////////////// -// // Menu // @@ -687,8 +648,8 @@ // // Generated from the TEXTINCLUDE 3 resource. // +#include "tt-version.rc" - ///////////////////////////////////////////////////////////////////////////// #endif // not APSTUDIO_INVOKED Modified: trunk/teraterm/teraterm/ttermpro.v10.vcxproj =================================================================== --- trunk/teraterm/teraterm/ttermpro.v10.vcxproj 2017-07-04 15:01:46 UTC (rev 6836) +++ trunk/teraterm/teraterm/ttermpro.v10.vcxproj 2017-07-04 15:01:52 UTC (rev 6837) @@ -173,6 +173,7 @@ <None Include="..\common\vt_classic.ico" /> </ItemGroup> <ItemGroup> + <ResourceCompile Include="tt-version.rc" /> <ResourceCompile Include="ttermpro.rc" /> </ItemGroup> <ItemGroup> @@ -214,4 +215,4 @@ <UserProperties RESOURCE_FILE="ttermpro.rc" /> </VisualStudio> </ProjectExtensions> -</Project> \ No newline at end of file +</Project> Modified: trunk/teraterm/teraterm/ttermpro.v10.vcxproj.filters =================================================================== --- trunk/teraterm/teraterm/ttermpro.v10.vcxproj.filters 2017-07-04 15:01:46 UTC (rev 6836) +++ trunk/teraterm/teraterm/ttermpro.v10.vcxproj.filters 2017-07-04 15:01:52 UTC (rev 6837) @@ -130,6 +130,9 @@ </None> </ItemGroup> <ItemGroup> + <ResourceCompile Include="tt-version.rc"> + <Filter>Resource Files</Filter> + </ResourceCompile> <ResourceCompile Include="ttermpro.rc"> <Filter>Resource Files</Filter> </ResourceCompile> @@ -145,4 +148,4 @@ <Filter>Header Files</Filter> </ClInclude> </ItemGroup> -</Project> \ No newline at end of file +</Project> Modified: trunk/teraterm/teraterm/ttermpro.v11.vcxproj =================================================================== --- trunk/teraterm/teraterm/ttermpro.v11.vcxproj 2017-07-04 15:01:46 UTC (rev 6836) +++ trunk/teraterm/teraterm/ttermpro.v11.vcxproj 2017-07-04 15:01:52 UTC (rev 6837) @@ -170,6 +170,7 @@ <Image Include="..\common\vt_classic.ico" /> </ItemGroup> <ItemGroup> + <ResourceCompile Include="tt-version.rc" /> <ResourceCompile Include="ttermpro.rc" /> </ItemGroup> <ItemGroup> @@ -211,4 +212,4 @@ <UserProperties RESOURCE_FILE="ttermpro.rc" /> </VisualStudio> </ProjectExtensions> -</Project> \ No newline at end of file +</Project> Modified: trunk/teraterm/teraterm/ttermpro.v11.vcxproj.filters =================================================================== --- trunk/teraterm/teraterm/ttermpro.v11.vcxproj.filters 2017-07-04 15:01:46 UTC (rev 6836) +++ trunk/teraterm/teraterm/ttermpro.v11.vcxproj.filters 2017-07-04 15:01:52 UTC (rev 6837) @@ -130,6 +130,9 @@ </Image> </ItemGroup> <ItemGroup> + <ResourceCompile Include="tt-version.rc"> + <Filter>Resource Files</Filter> + </ResourceCompile> <ResourceCompile Include="ttermpro.rc"> <Filter>Resource Files</Filter> </ResourceCompile> @@ -145,4 +148,4 @@ <Filter>Header Files</Filter> </ClInclude> </ItemGroup> -</Project> \ No newline at end of file +</Project> Modified: trunk/teraterm/teraterm/ttermpro.v12.vcxproj =================================================================== --- trunk/teraterm/teraterm/ttermpro.v12.vcxproj 2017-07-04 15:01:46 UTC (rev 6836) +++ trunk/teraterm/teraterm/ttermpro.v12.vcxproj 2017-07-04 15:01:52 UTC (rev 6837) @@ -172,6 +172,7 @@ <Image Include="..\common\vt_classic.ico" /> </ItemGroup> <ItemGroup> + <ResourceCompile Include="tt-version.rc" /> <ResourceCompile Include="ttermpro.rc" /> </ItemGroup> <ItemGroup> @@ -213,4 +214,4 @@ <UserProperties RESOURCE_FILE="ttermpro.rc" /> </VisualStudio> </ProjectExtensions> -</Project> \ No newline at end of file +</Project> Modified: trunk/teraterm/teraterm/ttermpro.v12.vcxproj.filters =================================================================== --- trunk/teraterm/teraterm/ttermpro.v12.vcxproj.filters 2017-07-04 15:01:46 UTC (rev 6836) +++ trunk/teraterm/teraterm/ttermpro.v12.vcxproj.filters 2017-07-04 15:01:52 UTC (rev 6837) @@ -130,6 +130,9 @@ </Image> </ItemGroup> <ItemGroup> + <ResourceCompile Include="tt-version.rc"> + <Filter>Resource Files</Filter> + </ResourceCompile> <ResourceCompile Include="ttermpro.rc"> <Filter>Resource Files</Filter> </ResourceCompile> @@ -145,4 +148,4 @@ <Filter>Header Files</Filter> </ClInclude> </ItemGroup> -</Project> \ No newline at end of file +</Project> Modified: trunk/teraterm/teraterm/ttermpro.v14.vcxproj =================================================================== --- trunk/teraterm/teraterm/ttermpro.v14.vcxproj 2017-07-04 15:01:46 UTC (rev 6836) +++ trunk/teraterm/teraterm/ttermpro.v14.vcxproj 2017-07-04 15:01:52 UTC (rev 6837) @@ -174,6 +174,7 @@ <Image Include="..\common\vt_classic.ico" /> </ItemGroup> <ItemGroup> + <ResourceCompile Include="tt-version.rc" /> <ResourceCompile Include="ttermpro.rc" /> </ItemGroup> <ItemGroup> @@ -215,4 +216,4 @@ <UserProperties RESOURCE_FILE="ttermpro.rc" /> </VisualStudio> </ProjectExtensions> -</Project> \ No newline at end of file +</Project> Modified: trunk/teraterm/teraterm/ttermpro.v14.vcxproj.filters =================================================================== --- trunk/teraterm/teraterm/ttermpro.v14.vcxproj.filters 2017-07-04 15:01:46 UTC (rev 6836) +++ trunk/teraterm/teraterm/ttermpro.v14.vcxproj.filters 2017-07-04 15:01:52 UTC (rev 6837) @@ -130,6 +130,9 @@ </Image> </ItemGroup> <ItemGroup> + <ResourceCompile Include="tt-version.rc"> + <Filter>Resource Files</Filter> + </ResourceCompile> <ResourceCompile Include="ttermpro.rc"> <Filter>Resource Files</Filter> </ResourceCompile> @@ -145,4 +148,4 @@ <Filter>Header Files</Filter> </ClInclude> </ItemGroup> -</Project> \ No newline at end of file +</Project> Modified: trunk/teraterm/teraterm/ttermpro.v15.vcxproj =================================================================== --- trunk/teraterm/teraterm/ttermpro.v15.vcxproj 2017-07-04 15:01:46 UTC (rev 6836) +++ trunk/teraterm/teraterm/ttermpro.v15.vcxproj 2017-07-04 15:01:52 UTC (rev 6837) @@ -175,6 +175,7 @@ <Image Include="..\common\vt_classic.ico" /> </ItemGroup> <ItemGroup> + <ResourceCompile Include="tt-version.rc" /> <ResourceCompile Include="ttermpro.rc" /> </ItemGroup> <ItemGroup> @@ -216,4 +217,4 @@ <UserProperties RESOURCE_FILE="ttermpro.rc" /> </VisualStudio> </ProjectExtensions> -</Project> \ No newline at end of file +</Project> Modified: trunk/teraterm/teraterm/ttermpro.v15.vcxproj.filters =================================================================== --- trunk/teraterm/teraterm/ttermpro.v15.vcxproj.filters 2017-07-04 15:01:46 UTC (rev 6836) +++ trunk/teraterm/teraterm/ttermpro.v15.vcxproj.filters 2017-07-04 15:01:52 UTC (rev 6837) @@ -130,6 +130,9 @@ </Image> </ItemGroup> <ItemGroup> + <ResourceCompile Include="tt-version.rc"> + <Filter>Resource Files</Filter> + </ResourceCompile> <ResourceCompile Include="ttermpro.rc"> <Filter>Resource Files</Filter> </ResourceCompile> @@ -145,4 +148,4 @@ <Filter>Header Files</Filter> </ClInclude> </ItemGroup> -</Project> \ No newline at end of file +</Project> Modified: trunk/teraterm/teraterm/ttermpro.v9.vcproj =================================================================== --- trunk/teraterm/teraterm/ttermpro.v9.vcproj 2017-07-04 15:01:46 UTC (rev 6836) +++ trunk/teraterm/teraterm/ttermpro.v9.vcproj 2017-07-04 15:01:52 UTC (rev 6837) @@ -273,6 +273,10 @@ > </File> <File + RelativePath="tt-version.rc" + > + </File> + <File RelativePath="ttermpro.rc" > </File> Modified: trunk/teraterm/teraterm/ttermpro.vcproj =================================================================== --- trunk/teraterm/teraterm/ttermpro.vcproj 2017-07-04 15:01:46 UTC (rev 6836) +++ trunk/teraterm/teraterm/ttermpro.vcproj 2017-07-04 15:01:52 UTC (rev 6837) @@ -278,6 +278,10 @@ > </File> <File + RelativePath="tt-version.rc" + > + </File> + <File RelativePath="ttermpro.rc" > </File> Modified: trunk/teraterm/ttpdlg/ttdlg.c =================================================================== --- trunk/teraterm/ttpdlg/ttdlg.c 2017-07-04 15:01:46 UTC (rev 6836) +++ trunk/teraterm/ttpdlg/ttdlg.c 2017-07-04 15:01:52 UTC (rev 6837) @@ -2439,66 +2439,7 @@ return FALSE; } -// \x8E\xC0\x8Ds\x83t\x83@\x83C\x83\x8B\x82\xA9\x82\xE7\x83o\x81[\x83W\x83\x87\x83\x93\x8F\xEE\x95\xF1\x82\xE9 (2005.2.28 yutaka) -static void get_file_version(char *exefile, int *major, int *minor, int *release, int *build) -{ - typedef struct { - WORD wLanguage; - WORD wCodePage; - } LANGANDCODEPAGE, *LPLANGANDCODEPAGE; - LPLANGANDCODEPAGE lplgcode; - UINT unLen; - DWORD size; - char *buf = NULL; - BOOL ret; - int i; - char fmt[80]; - char *pbuf; - size = GetFileVersionInfoSize(exefile, NULL); - if (size == 0) { - goto error; - } - buf = malloc(size); - ZeroMemory(buf, size); - - if (GetFileVersionInfo(exefile, 0, size, buf) == FALSE) { - goto error; - } - - ret = VerQueryValue(buf, "\\VarFileInfo\\Translation", - (LPVOID *)&lplgcode, &unLen); - if (ret == FALSE) { - goto error; - } - - for (i = 0 ; i < (int)(unLen / sizeof(LANGANDCODEPAGE)) ; i++) { - _snprintf_s(fmt, sizeof(fmt), _TRUNCATE, "\\StringFileInfo\\%04x%04x\\FileVersion", - lplgcode[i].wLanguage, lplgcode[i].wCodePage); - VerQueryValue(buf, fmt, &pbuf, &unLen); - if (unLen > 0) { // get success - int n, a, b, c, d; - - n = sscanf(pbuf, "%d, %d, %d, %d", &a, &b, &c, &d); - if (n == 4) { // convert success - *major = a; - *minor = b; - *release = c; - *build = d; - break; - } - } - } - - free(buf); - return; - -error: - free(buf); - *major = *minor = *release = *build = 0; -} - - // // static text\x82ɏ\x91\x82\xA9\x82ꂽURL\x82\xF0\x83_\x83u\x83\x8B\x83N\x83\x8A\x83b\x83N\x82\xB7\x82\xE9\x82ƁA\x83u\x83\x89\x83E\x83U\x82\xAA\x8BN\x93\xAE\x82\xB7\x82\xE9\x82悤\x82ɂ\xB7\x82\xE9\x81B // based on sakura editor 1.5.2.1 # CDlgAbout.cpp @@ -2705,7 +2646,6 @@ BOOL CALLBACK AboutDlg(HWND Dialog, UINT Message, WPARAM wParam, LPARAM lParam) { - int a, b, c, d; char buf[128], tmpbuf[128]; HDC hdc; HWND hwnd; @@ -2793,10 +2733,8 @@ get_lang_msg("DLG_ABOUT_TITLE", uimsg, sizeof(uimsg), uimsg2, UILanguageFile); SetWindowText(Dialog, uimsg); - // Tera Term\x82̃o\x81[\x83W\x83\x87\x83\x93\x82\xF0\x90ݒ肷\x82\xE9 (2005.2.28 yutaka) - // __argv[0]\x82ł\xCD WinExec() \x82\xB5\x82\xBD\x83v\x83\x8D\x83Z\x83X\x82\xA9\x82\xE7\x8EQ\x8FƂł\xAB\x82Ȃ\xA2\x82悤\x82Ȃ̂ō폜\x81B(2005.3.14 yutaka) - get_file_version("ttermpro.exe", &a, &b, &c, &d); - _snprintf_s(buf, sizeof(buf), _TRUNCATE, "Version %d.%d", a, b); + // Tera Term \x96{\x91̂̃o\x81[\x83W\x83\x87\x83\x93 + _snprintf_s(buf, sizeof(buf), _TRUNCATE, "Version %d.%d", TT_VERSION_MAJOR, TT_VERSION_MINOR); #ifdef SVNVERSION _snprintf_s(tmpbuf, sizeof(tmpbuf), _TRUNCATE, " (SVN# %d)", SVNVERSION); strncat_s(buf, sizeof(buf), tmpbuf, _TRUNCATE); Modified: trunk/teraterm/ttpdlg/ttpdlg.v10.vcxproj =================================================================== --- trunk/teraterm/ttpdlg/ttpdlg.v10.vcxproj 2017-07-04 15:01:46 UTC (rev 6836) +++ trunk/teraterm/ttpdlg/ttpdlg.v10.vcxproj 2017-07-04 15:01:52 UTC (rev 6837) @@ -75,7 +75,7 @@ <AdditionalIncludeDirectories>$(SolutionDir)common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ResourceCompile> <Link> - <AdditionalDependencies>Version.lib;onig_s.lib;ttpcmn.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>onig_s.lib;ttpcmn.lib;%(AdditionalDependencies)</AdditionalDependencies> <SuppressStartupBanner>true</SuppressStartupBanner> <AdditionalLibraryDirectories>$(SolutionDir)..\libs\oniguruma\src;$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <ModuleDefinitionFile>$(ProjectName).def</ModuleDefinitionFile> @@ -115,7 +115,7 @@ <AdditionalIncludeDirectories>$(SolutionDir)common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ResourceCompile> <Link> - <AdditionalDependencies>Version.lib;onig_sd.lib;ttpcmn.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>onig_sd.lib;ttpcmn.lib;%(AdditionalDependencies)</AdditionalDependencies> <SuppressStartupBanner>true</SuppressStartupBanner> <AdditionalLibraryDirectories>$(SolutionDir)..\libs\oniguruma\src;$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <ModuleDefinitionFile>$(ProjectName).def</ModuleDefinitionFile> @@ -161,4 +161,4 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ImportGroup Label="ExtensionTargets"> </ImportGroup> -</Project> \ No newline at end of file +</Project> Modified: trunk/teraterm/ttpdlg/ttpdlg.v11.vcxproj =================================================================== --- trunk/teraterm/ttpdlg/ttpdlg.v11.vcxproj 2017-07-04 15:01:46 UTC (rev 6836) +++ trunk/teraterm/ttpdlg/ttpdlg.v11.vcxproj 2017-07-04 15:01:52 UTC (rev 6837) @@ -80,7 +80,7 @@ <AdditionalIncludeDirectories>$(SolutionDir)common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ResourceCompile> <Link> - <AdditionalDependencies>Version.lib;onig_s.lib;ttpcmn.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>onig_s.lib;ttpcmn.lib;%(AdditionalDependencies)</AdditionalDependencies> <SuppressStartupBanner>true</SuppressStartupBanner> <AdditionalLibraryDirectories>$(SolutionDir)..\libs\oniguruma\src;$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <ModuleDefinitionFile>$(ProjectName).def</ModuleDefinitionFile> @@ -119,7 +119,7 @@ <AdditionalIncludeDirectories>$(SolutionDir)common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ResourceCompile> <Link> - <AdditionalDependencies>Version.lib;onig_sd.lib;ttpcmn.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>onig_sd.lib;ttpcmn.lib;%(AdditionalDependencies)</AdditionalDependencies> <SuppressStartupBanner>true</SuppressStartupBanner> <AdditionalLibraryDirectories>$(SolutionDir)..\libs\oniguruma\src;$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <ModuleDefinitionFile>$(ProjectName).def</ModuleDefinitionFile> @@ -165,4 +165,4 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ImportGroup Label="ExtensionTargets"> </ImportGroup> -</Project> \ No newline at end of file +</Project> Modified: trunk/teraterm/ttpdlg/ttpdlg.v12.vcxproj =================================================================== --- trunk/teraterm/ttpdlg/ttpdlg.v12.vcxproj 2017-07-04 15:01:46 UTC (rev 6836) +++ trunk/teraterm/ttpdlg/ttpdlg.v12.vcxproj 2017-07-04 15:01:52 UTC (rev 6837) @@ -80,7 +80,7 @@ <AdditionalIncludeDirectories>$(SolutionDir)common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ResourceCompile> <Link> - <AdditionalDependencies>Version.lib;onig_s.lib;ttpcmn.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>onig_s.lib;ttpcmn.lib;%(AdditionalDependencies)</AdditionalDependencies> <SuppressStartupBanner>true</SuppressStartupBanner> <AdditionalLibraryDirectories>$(SolutionDir)..\libs\oniguruma\src;$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <ModuleDefinitionFile>$(ProjectName).def</ModuleDefinitionFile> @@ -119,7 +119,7 @@ <AdditionalIncludeDirectories>$(SolutionDir)common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ResourceCompile> <Link> - <AdditionalDependencies>Version.lib;onig_sd.lib;ttpcmn.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>onig_sd.lib;ttpcmn.lib;%(AdditionalDependencies)</AdditionalDependencies> <SuppressStartupBanner>true</SuppressStartupBanner> <AdditionalLibraryDirectories>$(SolutionDir)..\libs\oniguruma\src;$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <ModuleDefinitionFile>$(ProjectName).def</ModuleDefinitionFile> Modified: trunk/teraterm/ttpdlg/ttpdlg.v14.vcxproj =================================================================== --- trunk/teraterm/ttpdlg/ttpdlg.v14.vcxproj 2017-07-04 15:01:46 UTC (rev 6836) +++ trunk/teraterm/ttpdlg/ttpdlg.v14.vcxproj 2017-07-04 15:01:52 UTC (rev 6837) @@ -80,7 +80,7 @@ <AdditionalIncludeDirectories>$(SolutionDir)common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ResourceCompile> <Link> - <AdditionalDependencies>Version.lib;onig_s.lib;ttpcmn.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>onig_s.lib;ttpcmn.lib;%(AdditionalDependencies)</AdditionalDependencies> <SuppressStartupBanner>true</SuppressStartupBanner> <AdditionalLibraryDirectories>$(SolutionDir)..\libs\oniguruma\src;$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <ModuleDefinitionFile>$(ProjectName).def</ModuleDefinitionFile> @@ -119,7 +119,7 @@ <AdditionalIncludeDirectories>$(SolutionDir)common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ResourceCompile> <Link> - <AdditionalDependencies>Version.lib;onig_sd.lib;ttpcmn.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>onig_sd.lib;ttpcmn.lib;%(AdditionalDependencies)</AdditionalDependencies> <SuppressStartupBanner>true</SuppressStartupBanner> <AdditionalLibraryDirectories>$(SolutionDir)..\libs\oniguruma\src;$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <ModuleDefinitionFile>$(ProjectName).def</ModuleDefinitionFile> Modified: trunk/teraterm/ttpdlg/ttpdlg.v15.vcxproj =================================================================== --- trunk/teraterm/ttpdlg/ttpdlg.v15.vcxproj 2017-07-04 15:01:46 UTC (rev 6836) +++ trunk/teraterm/ttpdlg/ttpdlg.v15.vcxproj 2017-07-04 15:01:52 UTC (rev 6837) @@ -81,7 +81,7 @@ <AdditionalIncludeDirectories>$(SolutionDir)common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ResourceCompile> <Link> - <AdditionalDependencies>Version.lib;onig_s.lib;ttpcmn.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>onig_s.lib;ttpcmn.lib;%(AdditionalDependencies)</AdditionalDependencies> <SuppressStartupBanner>true</SuppressStartupBanner> <AdditionalLibraryDirectories>$(SolutionDir)..\libs\oniguruma\src;$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <ModuleDefinitionFile>$(ProjectName).def</ModuleDefinitionFile> @@ -120,7 +120,7 @@ <AdditionalIncludeDirectories>$(SolutionDir)common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ResourceCompile> <Link> - <AdditionalDependencies>Version.lib;onig_sd.lib;ttpcmn.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>onig_sd.lib;ttpcmn.lib;%(AdditionalDependencies)</AdditionalDependencies> <SuppressStartupBanner>true</SuppressStartupBanner> <AdditionalLibraryDirectories>$(SolutionDir)..\libs\oniguruma\src;$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <ModuleDefinitionFile>$(ProjectName).def</ModuleDefinitionFile> @@ -166,4 +166,4 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ImportGroup Label="ExtensionTargets"> </ImportGroup> -</Project> \ No newline at end of file +</Project> Modified: trunk/teraterm/ttpdlg/ttpdlg.v9.vcproj =================================================================== --- trunk/teraterm/ttpdlg/ttpdlg.v9.vcproj 2017-07-04 15:01:46 UTC (rev 6836) +++ trunk/teraterm/ttpdlg/ttpdlg.v9.vcproj 2017-07-04 15:01:52 UTC (rev 6837) @@ -73,7 +73,7 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="Version.lib onig_s.lib ttpcmn.lib" + AdditionalDependencies="onig_s.lib ttpcmn.lib" LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories="$(SolutionDir)..\libs\oniguruma\src;$(OutDir)" @@ -163,7 +163,7 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="Version.lib onig_sd.lib ttpcmn.lib" + AdditionalDependencies="onig_sd.lib ttpcmn.lib" LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories="$(SolutionDir)..\libs\oniguruma\src;$(OutDir)" Modified: trunk/teraterm/ttpdlg/ttpdlg.vcproj =================================================================== --- trunk/teraterm/ttpdlg/ttpdlg.vcproj 2017-07-04 15:01:46 UTC (rev 6836) +++ trunk/teraterm/ttpdlg/ttpdlg.vcproj 2017-07-04 15:01:52 UTC (rev 6837) @@ -72,7 +72,7 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="Version.lib onig_s.lib ttpcmn.lib" + AdditionalDependencies="onig_s.lib ttpcmn.lib" LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories="$(SolutionDir)..\libs\oniguruma\src;$(OutDir)" @@ -163,7 +163,7 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="Version.lib onig_sd.lib ttpcmn.lib" + AdditionalDependencies="onig_sd.lib ttpcmn.lib" LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories="$(SolutionDir)..\libs\oniguruma\src;$(OutDir)" Added: trunk/teraterm/ttpmacro/ttm-version.rc =================================================================== --- trunk/teraterm/ttpmacro/ttm-version.rc (rev 0) +++ trunk/teraterm/ttpmacro/ttm-version.rc 2017-07-04 15:01:52 UTC (rev 6837) @@ -0,0 +1,39 @@ +///////////////////////////////////////////////////////////////////////////// +// +// Version +// + +#include "tt-version.h" + +VS_VERSION_INFO VERSIONINFO + FILEVERSION TT_VERSION_MAJOR,TT_VERSION_MINOR,0,0 + PRODUCTVERSION TT_VERSION_MAJOR,TT_VERSION_MINOR,0,0 + FILEFLAGSMASK 0x3fL +#ifdef _DEBUG + FILEFLAGS 0x1L +#else + FILEFLAGS 0x0L +#endif + FILEOS 0x4L + FILETYPE 0x1L + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904b0" + BEGIN + VALUE "CompanyName", "T. Teranishi, TeraTerm Project" + VALUE "FileDescription", "TTPMACRO" + VALUE "FileVersion", TT_RES_VERSION_STR + VALUE "InternalName", "TTPMACRO" + VALUE "LegalCopyright", "Copyright (C) 1994-1998 T. Teranishi, (C) 2004-2017 TeraTerm Project" + VALUE "OriginalFilename", "TTPMACRO.EXE" + VALUE "ProductName", "TTPMACRO" + VALUE "ProductVersion", TT_RES_VERSION_STR + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1200 + END +END Modified: trunk/teraterm/ttpmacro/ttpmacro.rc =================================================================== --- trunk/teraterm/ttpmacro/ttpmacro.rc 2017-07-04 15:01:46 UTC (rev 6836) +++ trunk/teraterm/ttpmacro/ttpmacro.rc 2017-07-04 15:01:52 UTC (rev 6837) @@ -40,6 +40,7 @@ 3 TEXTINCLUDE BEGIN + "#include ""ttm-version.rc""\r\n" "\0" END @@ -143,45 +144,6 @@ ///////////////////////////////////////////////////////////////////////////// // -// Version -// - -VS_VERSION_INFO VERSIONINFO - FILEVERSION 4,95,0,0 - PRODUCTVERSION 4,95,0,0 - FILEFLAGSMASK 0x3fL -#ifdef _DEBUG - FILEFLAGS 0x1L -#else - FILEFLAGS 0x0L -#endif - FILEOS 0x4L - FILETYPE 0x1L - FILESUBTYPE 0x0L -BEGIN - BLOCK "StringFileInfo" - BEGIN - BLOCK "040904b0" - BEGIN - VALUE "CompanyName", "T. Teranishi, TeraTerm Project" - VALUE "FileDescription", "TTPMACRO" - VALUE "FileVersion", "4, 95, 0, 0" - VALUE "InternalName", "TTPMACRO" - VALUE "LegalCopyright", "Copyright (C) 1994-1998 T. Teranishi, (C) 2004-2017 TeraTerm Project" - VALUE "OriginalFilename", "TTPMACRO.EXE" - VALUE "ProductName", "TTPMACRO" - VALUE "ProductVersion", "4, 95, 0, 0" - END - END - BLOCK "VarFileInfo" - BEGIN - VALUE "Translation", 0x409, 1200 - END -END - - -///////////////////////////////////////////////////////////////////////////// -// // Icon // @@ -193,3 +155,14 @@ ///////////////////////////////////////////////////////////////////////////// + +#ifndef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 3 resource. +// +#include "ttm-version.rc" + +///////////////////////////////////////////////////////////////////////////// +#endif // not APSTUDIO_INVOKED + Modified: trunk/teraterm/ttpmacro/ttpmacro.v10.vcxproj =================================================================== --- trunk/teraterm/ttpmacro/ttpmacro.v10.vcxproj 2017-07-04 15:01:46 UTC (rev 6836) +++ trunk/teraterm/ttpmacro/ttpmacro.v10.vcxproj 2017-07-04 15:01:52 UTC (rev 6837) @@ -167,6 +167,7 @@ <None Include="Ttmacro.ico" /> </ItemGroup> <ItemGroup> + <ResourceCompile Include="ttm-version.rc" /> <ResourceCompile Include="ttpmacro.rc"> <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions> <Culture Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">0x0411</Culture> Modified: trunk/teraterm/ttpmacro/ttpmacro.v10.vcxproj.filters =================================================================== --- trunk/teraterm/ttpmacro/ttpmacro.v10.vcxproj.filters 2017-07-04 15:01:46 UTC (rev 6836) +++ trunk/teraterm/ttpmacro/ttpmacro.v10.vcxproj.filters 2017-07-04 15:01:52 UTC (rev 6837) @@ -136,6 +136,9 @@ </None> </ItemGroup> <ItemGroup> + <ResourceCompile Include="ttm-version.rc"> + <Filter>Resource Files</Filter> + </ResourceCompile> <ResourceCompile Include="ttpmacro.rc"> <Filter>Resource Files</Filter> </ResourceCompile> Modified: trunk/teraterm/ttpmacro/ttpmacro.v11.vcxproj =================================================================== --- trunk/teraterm/ttpmacro/ttpmacro.v11.vcxproj 2017-07-04 15:01:46 UTC (rev 6836) +++ trunk/teraterm/ttpmacro/ttpmacro.v11.vcxproj 2017-07-04 15:01:52 UTC (rev 6837) @@ -167,6 +167,7 @@ <Image Include="Ttmacro.ico" /> </ItemGroup> <ItemGroup> + <ResourceCompile Include="ttm-version.rc" /> <ResourceCompile Include="ttpmacro.rc"> <Culture Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">0x0411</Culture> <Culture Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">0x0411</Culture> Modified: trunk/teraterm/ttpmacro/ttpmacro.v11.vcxproj.filters =================================================================== --- trunk/teraterm/ttpmacro/ttpmacro.v11.vcxproj.filters 2017-07-04 15:01:46 UTC (rev 6836) +++ trunk/teraterm/ttpmacro/ttpmacro.v11.vcxproj.filters 2017-07-04 15:01:52 UTC (rev 6837) @@ -136,6 +136,9 @@ </Image> </ItemGroup> <ItemGroup> + <ResourceCompile Include="ttm-version.rc"> + <Filter>Resource Files</Filter> + </ResourceCompile> <ResourceCompile Include="ttpmacro.rc"> <Filter>Resource Files</Filter> </ResourceCompile> Modified: trunk/teraterm/ttpmacro/ttpmacro.v12.vcxproj =================================================================== --- trunk/teraterm/ttpmacro/ttpmacro.v12.vcxproj 2017-07-04 15:01:46 UTC (rev 6836) +++ trunk/teraterm/ttpmacro/ttpmacro.v12.vcxproj 2017-07-04 15:01:52 UTC (rev 6837) @@ -169,6 +169,7 @@ <Image Include="Ttmacro.ico" /> </ItemGroup> <ItemGroup> + <ResourceCompile Include="ttm-version.rc" /> <ResourceCompile Include="ttpmacro.rc"> <Culture Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">0x0411</Culture> <Culture Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">0x0411</Culture> Modified: trunk/teraterm/ttpmacro/ttpmacro.v12.vcxproj.filters =================================================================== --- trunk/teraterm/ttpmacro/ttpmacro.v12.vcxproj.filters 2017-07-04 15:01:46 UTC (rev 6836) +++ trunk/teraterm/ttpmacro/ttpmacro.v12.vcxproj.filters 2017-07-04 15:01:52 UTC (rev 6837) @@ -136,6 +136,9 @@ </Image> </ItemGroup> <ItemGroup> + <ResourceCompile Include="ttm-version.rc"> + <Filter>Resource Files</Filter> + </ResourceCompile> <ResourceCompile Include="ttpmacro.rc"> <Filter>Resource Files</Filter> </ResourceCompile> Modified: trunk/teraterm/ttpmacro/ttpmacro.v14.vcxproj =================================================================== --- trunk/teraterm/ttpmacro/ttpmacro.v14.vcxproj 2017-07-04 15:01:46 UTC (rev 6836) +++ trunk/teraterm/ttpmacro/ttpmacro.v14.vcxproj 2017-07-04 15:01:52 UTC (rev 6837) @@ -169,6 +169,7 @@ <Image Include="Ttmacro.ico" /> </ItemGroup> <ItemGroup> + <ResourceCompile Include="ttm-version.rc" /> <ResourceCompile Include="ttpmacro.rc"> <Culture Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">0x0411</Culture> <Culture Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">0x0411</Culture> Modified: trunk/teraterm/ttpmacro/ttpmacro.v14.vcxproj.filters =================================================================== --- trunk/teraterm/ttpmacro/ttpmacro.v14.vcxproj.filters 2017-07-04 15:01:46 UTC (rev 6836) +++ trunk/teraterm/ttpmacro/ttpmacro.v14.vcxproj.filters 2017-07-04 15:01:52 UTC (rev 6837) @@ -136,6 +136,9 @@ </Image> </ItemGroup> <ItemGroup> + <ResourceCompile Include="ttm-version.rc"> + <Filter>Resource Files</Filter> + </ResourceCompile> <ResourceCompile Include="ttpmacro.rc"> <Filter>Resource Files</Filter> </ResourceCompile> Modified: trunk/teraterm/ttpmacro/ttpmacro.v15.vcxproj =================================================================== --- trunk/teraterm/ttpmacro/ttpmacro.v15.vcxproj 2017-07-04 15:01:46 UTC (rev 6836) +++ trunk/teraterm/ttpmacro/ttpmacro.v15.vcxproj 2017-07-04 15:01:52 UTC (rev 6837) @@ -170,6 +170,7 @@ <Image Include="Ttmacro.ico" /> </ItemGroup> <ItemGroup> + <ResourceCompile Include="ttm-version.rc" /> <ResourceCompile Include="ttpmacro.rc"> <Culture Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">0x0411</Culture> <Culture Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">0x0411</Culture> Modified: trunk/teraterm/ttpmacro/ttpmacro.v15.vcxproj.filters =================================================================== --- trunk/teraterm/ttpmacro/ttpmacro.v15.vcxproj.filters 2017-07-04 15:01:46 UTC (rev 6836) +++ trunk/teraterm/ttpmacro/ttpmacro.v15.vcxproj.filters 2017-07-04 15:01:52 UTC (rev 6837) @@ -136,6 +136,9 @@ </Image> </ItemGroup> <ItemGroup> + <ResourceCompile Include="ttm-version.rc"> + <Filter>Resource Files</Filter> + </ResourceCompile> <ResourceCompile Include="ttpmacro.rc"> <Filter>Resource Files</Filter> </ResourceCompile> Modified: trunk/teraterm/ttpmacro/ttpmacro.v9.vcproj =================================================================== --- trunk/teraterm/ttpmacro/ttpmacro.v9.vcproj 2017-07-04 15:01:46 UTC (rev 6836) +++ trunk/teraterm/ttpmacro/ttpmacro.v9.vcproj 2017-07-04 15:01:52 UTC (rev 6837) @@ -321,6 +321,10 @@ Filter="ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe" > <File + RelativePath="ttm-version.rc" + > + </File> + <File RelativePath="Ttmacro.ico" > </File> Modified: trunk/teraterm/ttpmacro/ttpmacro.vcproj =================================================================== --- trunk/teraterm/ttpmacro/ttpmacro.vcproj 2017-07-04 15:01:46 UTC (rev 6836) +++ trunk/teraterm/ttpmacro/ttpmacro.vcproj 2017-07-04 15:01:52 UTC (rev 6837) @@ -322,6 +322,10 @@ Filter="ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe" > <File + RelativePath=".\ttm-version.rc" + > + </File> + <File RelativePath="Ttmacro.ico" > </File> Modified: trunk/teraterm/ttpset/ttpset.v10.vcxproj =================================================================== --- trunk/teraterm/ttpset/ttpset.v10.vcxproj 2017-07-04 15:01:46 UTC (rev 6836) +++ trunk/teraterm/ttpset/ttpset.v10.vcxproj 2017-07-04 15:01:52 UTC (rev 6837) @@ -127,6 +127,7 @@ </ItemGroup> <ItemGroup> <ClInclude Include="..\common\teraterm.h" /> + <ClInclude Include="..\common\tt-version.h" /> <ClInclude Include="..\common\ttlib.h" /> <ClInclude Include="..\common\tttypes.h" /> </ItemGroup> @@ -142,4 +143,4 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ImportGroup Label="ExtensionTargets"> </ImportGroup> -</Project> \ No newline at end of file +</Project> Modified: trunk/teraterm/ttpset/ttpset.v10.vcxproj.filters =================================================================== --- trunk/teraterm/ttpset/ttpset.v10.vcxproj.filters 2017-07-04 15:01:46 UTC (rev 6836) +++ trunk/teraterm/ttpset/ttpset.v10.vcxproj.filters 2017-07-04 15:01:52 UTC (rev 6837) @@ -30,6 +30,9 @@ <ClInclude Include="..\common\teraterm.h"> <Filter>Header Files</Filter> </ClInclude> + <ClInclude Include="..\common\tt-version.h"> + <Filter>Header Files</Filter> + </ClInclude> <ClInclude Include="..\common\ttlib.h"> <Filter>Header Files</Filter> </ClInclude> @@ -42,4 +45,4 @@ <Filter>Def File</Filter> </None> </ItemGroup> -</Project> \ No newline at end of file +</Project> Modified: trunk/teraterm/ttpset/ttpset.v11.vcxproj =================================================================== --- trunk/teraterm/ttpset/ttpset.v11.vcxproj 2017-07-04 15:01:46 UTC (rev 6836) +++ trunk/teraterm/ttpset/ttpset.v11.vcxproj 2017-07-04 15:01:52 UTC (rev 6837) @@ -131,6 +131,7 @@ </ItemGroup> <ItemGroup> <ClInclude Include="..\common\teraterm.h" /> + <ClInclude Include="..\common\tt-version.h" /> <ClInclude Include="..\common\ttlib.h" /> <ClInclude Include="..\common\tttypes.h" /> </ItemGroup> @@ -146,4 +147,4 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ImportGroup Label="ExtensionTargets"> </ImportGroup> -</Project> \ No newline at end of file +</Project> Modified: trunk/teraterm/ttpset/ttpset.v11.vcxproj.filters =================================================================== --- trunk/teraterm/ttpset/ttpset.v11.vcxproj.filters 2017-07-04 15:01:46 UTC (rev 6836) +++ trunk/teraterm/ttpset/ttpset.v11.vcxproj.filters 2017-07-04 15:01:52 UTC (rev 6837) @@ -30,6 +30,9 @@ <ClInclude Include="..\common\teraterm.h"> <Filter>Header Files</Filter> </ClInclude> + <ClInclude Include="..\common\tt-version.h"> + <Filter>Header Files</Filter> + </ClInclude> <ClInclude Include="..\common\ttlib.h"> <Filter>Header Files</Filter> </ClInclude> @@ -42,4 +45,4 @@ <Filter>Def File</Filter> </None> </ItemGroup> -</Project> \ No newline at end of file +</Project> Modified: trunk/teraterm/ttpset/ttpset.v12.vcxproj =================================================================== --- trunk/teraterm/ttpset/ttpset.v12.vcxproj 2017-07-04 15:01:46 UTC (rev 6836) +++ trunk/teraterm/ttpset/ttpset.v12.vcxproj 2017-07-04 15:01:52 UTC (rev 6837) @@ -131,6 +131,7 @@ </ItemGroup> <ItemGroup> <ClInclude Include="..\common\teraterm.h" /> + <ClInclude Include="..\common\tt-version.h" /> <ClInclude Include="..\common\ttlib.h" /> <ClInclude Include="..\common\tttypes.h" /> </ItemGroup> @@ -146,4 +147,4 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ImportGroup Label="ExtensionTargets"> </ImportGroup> -</Project> \ No newline at end of file +</Project> Modified: trunk/teraterm/ttpset/ttpset.v12.vcxproj.filters =================================================================== --- trunk/teraterm/ttpset/ttpset.v12.vcxproj.filters 2017-07-04 15:01:46 UTC (rev 6836) +++ trunk/teraterm/ttpset/ttpset.v12.vcxproj.filters 2017-07-04 15:01:52 UTC (rev 6837) @@ -30,6 +30,9 @@ <ClInclude Include="..\common\teraterm.h"> <Filter>Header Files</Filter> </ClInclude> + <ClInclude Include="..\common\tt-version.h"> + <Filter>Header Files</Filter> + </ClInclude> <ClInclude Include="..\common\ttlib.h"> <Filter>Header Files</Filter> </ClInclude> @@ -42,4 +45,4 @@ <Filter>Def File</Filter> </None> </ItemGroup> -</Project> \ No newline at end of file +</Project> Modified: trunk/teraterm/ttpset/ttpset.v14.vcxproj =================================================================== --- trunk/teraterm/ttpset/ttpset.v14.vcxproj 2017-07-04 15:01:46 UTC (rev 6836) +++ trunk/teraterm/ttpset/ttpset.v14.vcxproj 2017-07-04 15:01:52 UTC (rev 6837) @@ -131,6 +131,7 @@ </ItemGroup> <ItemGroup> <ClInclude Include="..\common\teraterm.h" /> + <ClInclude Include="..\common\tt-version.h" /> <ClInclude Include="..\common\ttlib.h" /> <ClInclude Include="..\common\tttypes.h" /> </ItemGroup> @@ -146,4 +147,4 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ImportGroup Label="ExtensionTargets"> </ImportGroup> -</Project> \ No newline at end of file +</Project> Modified: trunk/teraterm/ttpset/ttpset.v14.vcxproj.filters =================================================================== --- trunk/teraterm/ttpset/ttpset.v14.vcxproj.filters 2017-07-04 15:01:46 UTC (rev 6836) +++ trunk/teraterm/ttpset/ttpset.v14.vcxproj.filters 2017-07-04 15:01:52 UTC (rev 6837) @@ -30,6 +30,9 @@ <ClInclude Include="..\common\teraterm.h"> <Filter>Header Files</Filter> </ClInclude> + <ClInclude Include="..\common\tt-version.h"> + <Filter>Header Files</Filter> + </ClInclude> <ClInclude Include="..\common\ttlib.h"> <Filter>Header Files</Filter> </ClInclude> @@ -42,4 +45,4 @@ <Filter>Def File</Filter> </None> </ItemGroup> -</Project> \ No newline at end of file +</Project> Modified: trunk/teraterm/ttpset/ttpset.v15.vcxproj =================================================================== --- trunk/teraterm/ttpset/ttpset.v15.vcxproj 2017-07-04 15:01:46 UTC (rev 6836) +++ trunk/teraterm/ttpset/ttpset.v15.vcxproj 2017-07-04 15:01:52 UTC (rev 6837) @@ -132,6 +132,7 @@ </ItemGroup> <ItemGroup> <ClInclude Include="..\common\teraterm.h" /> + <ClInclude Include="..\common\tt-version.h" /> <ClInclude Include="..\common\ttlib.h" /> <ClInclude Include="..\common\tttypes.h" /> </ItemGroup> @@ -147,4 +148,4 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ImportGroup Label="ExtensionTargets"> </ImportGroup> -</Project> \ No newline at end of file +</Project> Modified: trunk/teraterm/ttpset/ttpset.v15.vcxproj.filters =================================================================== --- trunk/teraterm/ttpset/ttpset.v15.vcxproj.filters 2017-07-04 15:01:46 UTC (rev 6836) +++ trunk/teraterm/ttpset/ttpset.v15.vcxproj.filters 2017-07-04 15:01:52 UTC (rev 6837) @@ -30,6 +30,9 @@ <ClInclude Include="..\common\teraterm.h"> <Filter>Header Files</Filter> </ClInclude> + <ClInclude Include="..\common\tt-version.h"> + <Filter>Header Files</Filter> + </ClInclude> <ClInclude Include="..\common\ttlib.h"> <Filter>Header Files</Filter> </ClInclude> @@ -42,4 +45,4 @@ <Filter>Def File</Filter> </None> </ItemGroup> -</Project> \ No newline at end of file +</Project> Modified: trunk/teraterm/ttpset/ttpset.v9.vcproj =================================================================== --- trunk/teraterm/ttpset/ttpset.v9.vcproj 2017-07-04 15:01:46 UTC (rev 6836) +++ trunk/teraterm/ttpset/ttpset.v9.vcproj 2017-07-04 15:01:52 UTC (rev 6837) @@ -222,6 +222,10 @@ > </File> <File + RelativePath="..\common\tt-version.h" + > + </File> + <File RelativePath="..\common\ttlib.h" > </File> Modified: trunk/teraterm/ttpset/ttpset.vcproj =================================================================== --- trunk/teraterm/ttpset/ttpset.vcproj 2017-07-04 15:01:46 UTC (rev 6836) +++ trunk/teraterm/ttpset/ttpset.vcproj 2017-07-04 15:01:52 UTC (rev 6837) @@ -223,6 +223,10 @@ > </File> <File + RelativePath="..\common\tt-version.h" + > + </File> + <File RelativePath="..\common\ttlib.h" > </File>