Tera TermRevision: 9884
https://osdn.net/projects/ttssh2/scm/svn/commits/9884
Author: zmatsuo
Date: 2022-04-24 01:03:18 +0900 (Sun, 24 Apr 2022)
Log Message:
-----------
aboutboxにビルド時の SDK バージョンを表示
- r9868
Revision Links:
--------------
https://osdn.net/projects/ttssh2/scm/svn/commits/9868
Modified Paths:
--------------
trunk/teraterm/ttpdlg/dlg_res.h
trunk/teraterm/ttpdlg/ttdlg.c
trunk/teraterm/ttpdlg/ttpdlg.rc
-------------- next part --------------
Modified: trunk/teraterm/ttpdlg/dlg_res.h
===================================================================
--- trunk/teraterm/ttpdlg/dlg_res.h 2022-04-22 15:37:48 UTC (rev 9883)
+++ trunk/teraterm/ttpdlg/dlg_res.h 2022-04-23 16:03:18 UTC (rev 9884)
@@ -160,7 +160,6 @@
#define IDC_WINLISTLABEL 1068
#define IDC_TCPIPTELNETKEEPALIVELABEL 1069
#define IDC_SELECT_DIR 1070
-#define IDC_BUILDTIME 1071
#define IDC_BUILDTOOL 1072
#define IDC_GENLANG_UI 1077
#define IDC_SFMT_VERSION 1078
@@ -177,7 +176,7 @@
#define IDC_GENLANGUI_LABEL -1
// Next default values for new objects
-//
+//
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_NO_MFC 1
Modified: trunk/teraterm/ttpdlg/ttdlg.c
===================================================================
--- trunk/teraterm/ttpdlg/ttdlg.c 2022-04-22 15:37:48 UTC (rev 9883)
+++ trunk/teraterm/ttpdlg/ttdlg.c 2022-04-23 16:03:18 UTC (rev 9884)
@@ -57,6 +57,7 @@
#include "win32helper.h"
#include "compat_win.h"
#include "ttlib_charset.h"
+#include "asprintf.h"
// Oniguruma: Regular expression library
#define ONIG_EXTERN extern
@@ -2461,11 +2462,9 @@
// - \x8F\xE3\x8BL URL \x82ł̕\\x8E\xA6\x83o\x81[\x83W\x83\x87\x83\x93
// - \x83C\x83\x93\x83X\x83g\x81[\x83\x8B\x90\xE6\x83t\x83H\x83\x8B\x83_\x96\xBC
// \x82ŁA\x8DŌ\xE3\x82̃u\x83\x8D\x83b\x83N\x82̐\x94\x8E\x9A\x82\xAA\x93\xAF\x82\xB6\x82ł͂Ȃ\xA2\x81B
-//
+//
static void GetSDKInfo(char *buf, size_t buf_size)
{
- char tmpbuf[128];
-
if (WDK_NTDDI_VERSION >= 0x0A00000B) {
strncpy_s(buf, buf_size, "Windows SDK", _TRUNCATE);
switch (WDK_NTDDI_VERSION) {
@@ -2616,14 +2615,25 @@
_snprintf_s(buf, sizeof(buf), _TRUNCATE, "SFMT %s", SFMT_VERSION);
SetDlgItemTextA(Dialog, IDC_SFMT_VERSION, buf);
- // \x83r\x83\x8B\x83h\x82\xB5\x82\xBD\x82Ƃ\xAB\x82Ɏg\x82\xED\x82ꂽ\x83R\x83\x93\x83p\x83C\x83\x89\x82\xF0\x90ݒ肷\x82\xE9\x81B(2009.3.3 yutaka)
- GetCompilerInfo(tmpbuf, sizeof(tmpbuf));
- _snprintf_s(buf, sizeof(buf), _TRUNCATE, "Built using %s", tmpbuf);
- SetDlgItemTextA(Dialog, IDC_BUILDTOOL, buf);
+ // build info
+ {
+ // \x83R\x83\x93\x83p\x83C\x83\x89\x81A\x93\xFA\x8E\x9E\x81ASDK
+ char *info;
+ char sdk[128];
+ GetCompilerInfo(tmpbuf, sizeof(tmpbuf));
+ GetSDKInfo(sdk, _countof(sdk));
+ asprintf(&info,
+ "Built info:\r\n"
+ " compiler: %s\r\n"
+ " date and time: %s %s\r\n"
+ " sdk: %s",
+ tmpbuf,
+ __DATE__, __TIME__,
+ sdk);
- // \x83r\x83\x8B\x83h\x83^\x83C\x83\x80\x82\xF0\x90ݒ肷\x82\xE9\x81B(2009.3.4 yutaka)
- _snprintf_s(buf, sizeof(buf), _TRUNCATE, "Build time: %s %s", __DATE__, __TIME__);
- SetDlgItemTextA(Dialog, IDC_BUILDTIME, buf);
+ SetDlgItemTextA(Dialog, IDC_BUILDTOOL, info);
+ free(info);
+ }
// static text \x82̃T\x83C\x83Y\x82\xF0\x95ύX (2007.4.16 maya)
hwnd = GetDlgItem(Dialog, IDC_AUTHOR_URL);
Modified: trunk/teraterm/ttpdlg/ttpdlg.rc
===================================================================
--- trunk/teraterm/ttpdlg/ttpdlg.rc 2022-04-22 15:37:48 UTC (rev 9883)
+++ trunk/teraterm/ttpdlg/ttpdlg.rc 2022-04-23 16:03:18 UTC (rev 9884)
@@ -214,7 +214,7 @@
PUSHBUTTON "&Help",IDC_DIRHELP,115,34,36,14
END
-IDD_ABOUTDLG DIALOGEX 20, 20, 187, 138
+IDD_ABOUTDLG DIALOGEX 20, 20, 187, 155
STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
CAPTION "About Tera Term"
FONT 14, "System", 0, 0, 0x0
@@ -231,10 +231,9 @@
CONTROL "IPv6 extention version 0.81",IDC_IPV6_LABEL,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,38,65,140,8
CONTROL "(C) 2000-2003 Jun-ya KATO",IDC_IPV6_RIGHTS_LABEL,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,43,74,135,8
LTEXT "Oniguruma: ",IDC_ONIGURUMA_LABEL,38,83,140,8
- LTEXT "Built using Microsoft Visual C++",IDC_BUILDTOOL,7,109,172,8
- LTEXT "Build time: ",IDC_BUILDTIME,7,117,172,8
- LTEXT "Author:",IDC_AUTHOR_LABEL,7,126,28,8
- LTEXT "https://ttssh2.osdn.jp/",IDC_AUTHOR_URL,36,126,143,8,SS_NOTIFY | WS_TABSTOP
+ LTEXT "Built using Microsoft Visual C++",IDC_BUILDTOOL,7,109,172,34,SS_NOTIFY
+ LTEXT "Author:",IDC_AUTHOR_LABEL,7,144,28,8
+ LTEXT "https://ttssh2.osdn.jp/",IDC_AUTHOR_URL,36,144,143,8,SS_NOTIFY | WS_TABSTOP
DEFPUSHBUTTON "OK",IDOK,145,5,32,14,WS_GROUP
LTEXT "SFMT:",IDC_SFMT_VERSION,38,93,141,8
END
@@ -388,7 +387,7 @@
IDD_ABOUTDLG, DIALOG
BEGIN
RIGHTMARGIN, 186
- BOTTOMMARGIN, 124
+ BOTTOMMARGIN, 152
END
IDD_GENDLG, DIALOG