uptime コマンドに 2 引数形式を追加し、GetTickCount64() へ移行

TTProxy/ProxyWSockHook.h

@@ -471,7 +471,7 @@ class ProxyWSockHook {
         in_addr addr;
         struct in6_addr addr6;
         char* buffer;
-        DWORD time;
+        ULONGLONG time;
         ConnectionInfo(ProxyInfo& proxy, String realhost):proxy(proxy), realhost(realhost), buffer(NULL) {
         }
         ~ConnectionInfo() {
@@ -664,7 +664,7 @@ class ProxyWSockHook {
             ConnectionInfo* info = table.get(url);
             ::LeaveCriticalSection(&section);
             if (info != NULL) {
-                info->time = ::GetTickCount();
+                info->time = ::GetTickCount64();
                 return info;
             }
             ProxyInfo proxy;
@@ -688,8 +688,8 @@ class ProxyWSockHook {
                 }
             }
             if (i >= countof(list)) {
-                DWORD now = ::GetTickCount();
-                DWORD max = 0;
+                ULONGLONG now = ::GetTickCount64();
+                ULONGLONG max = 0;
                 int index = -1;
                 for (i = 0; i < countof(list); i++) {
                     if (list[i] != NULL) {
@@ -709,7 +709,7 @@ class ProxyWSockHook {
             info->addr6.s6_addr[11] = 0xff;
             info->addr6.s6_addr[15] = i + 1;
 
-            info->time = ::GetTickCount();
+            info->time = ::GetTickCount64();
             return info;
         }
     };

doc/en/html/macro/command/uptime.html

@@ -17,12 +17,22 @@ <h1>uptime</h1>
 Gets System Up Time. <em>(version 4.81 or later)</em>
 </p>
 
+<h2>1) Format 1</h2>
+
 <pre class="macro-syntax">
 uptime &lt;intvar&gt;
 </pre>
 
+<h2>2) Format 2</h2>
+
+<pre class="macro-syntax">
+uptime &lt;secvar&gt; &lt;msecvar&gt;
+</pre>
+
 <h2>Remarks</h2>
 
+<h3>Format 1</h3>
+
 <p>
 Retrieves the number of milliseconds that have elapsed since the Windows OS was started,
 and then stores the value into the &lt;intvar&gt; variable.
@@ -32,11 +42,29 @@ <h2>Remarks</h2>
 The time wraps around to zero if the system is run continuously for 49.7 days.
 </p>
 
+<h3>Format 2</h3>
+
+<p>
+Retrieves the number of milliseconds that have elapsed since the Windows OS was started
+using <code>GetTickCount64()</code>, and then stores the following values:
+</p>
+
+<dl>
+<dt>&lt;secvar&gt;</dt>
+<dd>Windows OS uptime in seconds (<code>GetTickCount64() / 1000</code>)</dd>
+<dt>&lt;msecvar&gt;</dt>
+<dd>Sub-second portion of the uptime in milliseconds (<code>GetTickCount64() % 1000</code>)</dd>
+</dl>
+
+<p>
+Both &lt;secvar&gt; and &lt;msecvar&gt; must be integer variables.
+</p>
+
 
 <h2>Example</h2>
 
 <pre class="macro-example">
-; How to get the uptime in Windows
+; Format 1: How to get the uptime in Windows
 uptime var
 day = var / 86400000
 var = var % 86400000
@@ -61,5 +89,12 @@ <h2>Example</h2>
 messagebox str "running time"
 </pre>
 
+<pre class="macro-example">
+; Format 2: Get uptime as seconds and milliseconds
+uptime sec msec
+sprintf2 str "System Up Time: %d.%03d seconds" sec msec
+messagebox str "uptime"
+</pre>
+
 </body>
 </html>

doc/ja/html/macro/command/uptime.html

@@ -17,11 +17,21 @@ <h1>uptime</h1>
 OSの稼働時間を取得する。<em>(バージョン4.81以降)</em>
 </p>
 
+<h2>1) 形式1</h2>
+
 <pre class="macro-syntax">
 uptime &lt;intvar&gt;
 </pre>
 
-<h2>解説</h2>
+<h2>2) 形式2</h2>
+
+<pre class="macro-syntax">
+uptime &lt;secvar&gt; &lt;msecvar&gt;
+</pre>
+
+<h2>説明</h2>
+
+<h3>形式1</h3>
 
 <p>
 Windows OSの稼働時間（ミリ秒）を &lt;intvar&gt; に格納する。
@@ -31,11 +41,28 @@ <h1>uptime</h1>
 ※稼働時間が49日を経過すると、0に戻る。
 </p>
 
+<h3>形式2</h3>
+
+<p>
+<code>GetTickCount64()</code> を使ってWindows OSの稼働時間を取得し、下記の値を格納する。
+</p>
+
+<dl>
+<dt>&lt;secvar&gt;</dt>
+<dd>Windows OSの稼働時間（秒単位）(<code>GetTickCount64() / 1000</code>)</dd>
+<dt>&lt;msecvar&gt;</dt>
+<dd>稼働時間の1秒未満の部分（ミリ秒単位）(<code>GetTickCount64() % 1000</code>)</dd>
+</dl>
+
+<p>
+&lt;secvar&gt; と &lt;msecvar&gt; はともに整数型変数でなければならない。
+</p>
+
 
 <h2>例</h2>
 
 <pre class="macro-example">
-; How to get the uptime in Windows
+; 形式1: Windowsの稼働時間を取得する例
 uptime var
 day = var / 86400000
 var = var % 86400000
@@ -60,5 +87,12 @@ <h1>uptime</h1>
 messagebox str "running time"
 </pre>
 
+<pre class="macro-example">
+; 形式2: 稼働時間を秒とミリ秒で取得する例
+uptime sec msec
+sprintf2 str "System Up Time: %d.%03d seconds" sec msec
+messagebox str "uptime"
+</pre>
+
 </body>
 </html>

teraterm/common/compat_win.cpp

@@ -239,7 +239,7 @@ static HWND WINAPI GetConsoleWindowLocal(void)
 	}
 
 	// Format a "unique" NewWindowTitle.
-	wsprintfA(pszNewWindowTitle, "%d/%d", GetTickCount(), GetCurrentProcessId());
+	wsprintfA(pszNewWindowTitle, "%I64u/%d", GetTickCount64(), GetCurrentProcessId());
 
 	// Change current window title.
 	SetConsoleTitleA(pszNewWindowTitle);

teraterm/common/dlglib.c

@@ -153,13 +153,14 @@ void SetDlgPercent(HWND HDlg, int id_Item, int id_Progress, LONG a, LONG b, int
 	}
 }
 
-void SetDlgTime(HWND HDlg, int id_Item, DWORD stime, int bytes)
+void SetDlgTime(HWND HDlg, int id_Item, ULONGLONG stime, int bytes)
 {
-	static int prev_elapsed;
-	int elapsed, rate;
+	static ULONGLONG prev_elapsed;
+	ULONGLONG elapsed;
+	int rate;
 	wchar_t buff[64];
 
-	elapsed = (GetTickCount() - stime) / 1000;
+	elapsed = (GetTickCount64() - stime) / 1000;
 
 	if (elapsed == 0) {
 		prev_elapsed = 0;
@@ -172,15 +173,15 @@ void SetDlgTime(HWND HDlg, int id_Item, DWORD stime, int bytes)
 	}
 	prev_elapsed = elapsed;
 
-	rate = bytes / elapsed;
+	rate = (int)(bytes / elapsed);
 	if (rate < 1200) {
-		_snwprintf_s(buff, _countof(buff), _TRUNCATE, L"%d:%02d (%dBytes/s)", elapsed / 60, elapsed % 60, rate);
+		_snwprintf_s(buff, _countof(buff), _TRUNCATE, L"%llu:%02llu (%dBytes/s)", elapsed / 60, elapsed % 60, rate);
 	}
 	else if (rate < 1200000) {
-		_snwprintf_s(buff, _countof(buff), _TRUNCATE, L"%d:%02d (%d.%02dKB/s)", elapsed / 60, elapsed % 60, rate / 1000, rate / 10 % 100);
+		_snwprintf_s(buff, _countof(buff), _TRUNCATE, L"%llu:%02llu (%d.%02dKB/s)", elapsed / 60, elapsed % 60, rate / 1000, rate / 10 % 100);
 	}
 	else {
-		_snwprintf_s(buff, _countof(buff), _TRUNCATE, L"%d:%02d (%d.%02dMB/s)", elapsed / 60, elapsed % 60, rate / (1000 * 1000), rate / 10000 % 100);
+		_snwprintf_s(buff, _countof(buff), _TRUNCATE, L"%llu:%02llu (%d.%02dMB/s)", elapsed / 60, elapsed % 60, rate / (1000 * 1000), rate / 10000 % 100);
 	}
 
 	SetDlgItemTextW(HDlg, id_Item, buff);

teraterm/common/dlglib.h

@@ -44,7 +44,7 @@ void SetRB(HWND HDlg, int R, int FirstId, int LastId);
 void GetRB(HWND HDlg, LPWORD R, int FirstId, int LastId);
 void SetDlgNum(HWND HDlg, int id_Item, LONG Num);
 void SetDlgPercent(HWND HDlg, int id_Item, int id_Progress, LONG a, LONG b, int *prog);
-void SetDlgTime(HWND HDlg, int id_Item, DWORD elapsed, int bytes);
+void SetDlgTime(HWND HDlg, int id_Item, ULONGLONG elapsed, int bytes);
 void SetDropDownList(HWND HDlg, int Id_Item, const char *List[], int nsel);
 void SetDropDownListW(HWND HDlg, int Id_Item, const wchar_t *List[], int nsel);
 LONG GetCurSel(HWND HDlg, int Id_Item);

teraterm/common/ttlib.c

@@ -956,24 +956,24 @@ char *mctimelocal(const char *format, BOOL utc_flag)
  *	@return	邨碁℃譎る俣縺ｮ譁�ｭ怜�
  *			荳崎ｦ√↓縺ｪ縺｣縺溘ｉfree()縺吶ｋ縺薙→
  */
-char *strelapsed(DWORD start_time)
+char *strelapsed(ULONGLONG start_time)
 {
 	size_t sizeof_strtime = 20;
 	char *strtime = malloc(sizeof_strtime);
 	int days, hours, minutes, seconds, msecs;
-	DWORD delta = GetTickCount() - start_time;
+	ULONGLONG delta = GetTickCount64() - start_time;
 
-	msecs = delta % 1000;
+	msecs = (int)(delta % 1000);
 	delta /= 1000;
 
-	seconds = delta % 60;
+	seconds = (int)(delta % 60);
 	delta /= 60;
 
-	minutes = delta % 60;
+	minutes = (int)(delta % 60);
 	delta /= 60;
 
-	hours = delta % 24;
-	days = delta / 24;
+	hours = (int)(delta % 24);
+	days = (int)(delta / 24);
 
 	_snprintf_s(strtime, sizeof_strtime, _TRUNCATE,
 		"%d %02d:%02d:%02d.%03d",

teraterm/common/ttlib.h

@@ -137,7 +137,7 @@ DllExport BOOL HasMultiMonitorSupport();
 DllExport BOOL HasDnsQuery();
 DllExport BOOL HasBalloonTipSupport();
 DllExport char *mctimelocal(const char *format, BOOL utc_flag);
-char *strelapsed(DWORD start_time);
+char *strelapsed(ULONGLONG start_time);
 
 void b64encode(PCHAR dst, int dsize, PCHAR src, int len);
 DllExport int b64decode(PCHAR dst, int dsize, PCHAR src);

teraterm/common/tttypes.h

@@ -869,7 +869,7 @@ typedef struct {
 
 	void *NotifyIcon;
 
-	DWORD ConnectedTime;
+	ULONGLONG ConnectedTime;
 
 	void (*Log1Byte)(BYTE b);
 	void (*Log1Bin)(BYTE b);

teraterm/teraterm/buffer.c

@@ -115,7 +115,7 @@ static BOOL BoxSelect;			// TRUE=遏ｩ蠖｢驕ｸ謚 / FALSE=陦碁∈謚
 static POINT ClickCell;			// 繧ｯ繝ｪ繝�け縺励◆譁�ｭ幼ell
 static POINT SelectStartOld;	// 謠冗判縺励◆驕ｸ謚樣伜沺縲《tart
 static POINT SelectEndOld;		// 謠冗判縺励◆驕ｸ謚樣伜沺縲‘nd
-static DWORD SelectStartTime;
+static ULONGLONG SelectStartTime;
 static POINT DblClkStart;
 static POINT DblClkEnd;
 
@@ -4749,7 +4749,7 @@ void BuffStartSelect(int Xw, int Yw, BOOL Box, BOOL Shift)
 	Selected = FALSE;
 
 	// 驕ｸ謚樣幕蟋九ぎ繝ｼ繝
-	SelectStartTime = GetTickCount();
+	SelectStartTime = GetTickCount64();
 	Selecting = FALSE;
 
 	// push菴咲ｽｮ
@@ -4778,7 +4778,7 @@ void BuffChangeSelect(int Xw, int Yw, int NClick)
 
 	if (!Selecting) {
 		// 驕ｸ謚槭ぎ繝ｼ繝?
-		if (GetTickCount() - SelectStartTime < ts.SelectStartDelay) {
+		if (GetTickCount64() - SelectStartTime < ts.SelectStartDelay) {
 			// 繧ｬ繝ｼ繝我ｸｭ
 			return;
 		}
@@ -4889,7 +4889,7 @@ void BuffEndSelect(int Xw, int Yw)
 	(void)Xw;
 	(void)Yw;
 	if (!Selecting) {
-		if (GetTickCount() - SelectStartTime < ts.SelectStartDelay) {
+		if (GetTickCount64() - SelectStartTime < ts.SelectStartDelay) {
 			// 繧ｬ繝ｼ繝画凾髢謎ｻ･蜀�↑繧
 			// 驕ｸ謚樣伜沺隗｣髯､
 			SelectEnd = SelectStart;

teraterm/teraterm/commlib.c

@@ -805,7 +805,7 @@ void CommStart(PComVar cv, LONG lParam, PTTSet ts)
 			break;
 	}
 	cv->Ready = TRUE;
-	cv->ConnectedTime = GetTickCount();
+	cv->ConnectedTime = GetTickCount64();
 }
 
 BOOL CommCanClose(PComVar cv)

teraterm/teraterm/filesys.cpp

@@ -66,7 +66,7 @@ typedef struct {
 	LONG FileSize; // uint64_t FileSize;  TODO
 	LONG ByteCount; // uint64_t ByteCount;
 
-	DWORD StartTime;
+	ULONGLONG StartTime;
 	BOOL FilePause;
 
 	BOOL FileRetrySend, FileRetryEcho, FileCRSend, FileReadEOF, BinaryMode;
@@ -118,7 +118,7 @@ static BOOL OpenFTDlg(PFileVar fv)
 	free(DlgCaption);
 
 	fv->FilePause = FALSE;
-	fv->StartTime = GetTickCount();
+	fv->StartTime = GetTickCount64();
 	fv->SendDlg = FTDlg; /* File send */
 
 	return TRUE;

teraterm/teraterm/filesys_log.cpp

@@ -69,7 +69,7 @@ typedef struct {
 	LONG FileSize;		// ? 菴ｿ縺｣縺ｦ縺�↑縺
 	LONG ByteCount;		// 繝輔ぃ繧､繝ｫ繧ｵ繧､繧ｺ
 
-	DWORD StartTime;
+	ULONGLONG StartTime;
 
 	enum enumLineEnd eLineEnd;
 
@@ -406,7 +406,7 @@ static BOOL LogStart(PFileVar fv, const wchar_t *fname)
 	}
 
 	fv->IsPause = FALSE;
-	fv->StartTime = GetTickCount();
+	fv->StartTime = GetTickCount64();
 
 	if (ts.DeferredLogWriteMode) {
 		StartThread(fv);

teraterm/teraterm/filesys_proto.cpp

@@ -92,7 +92,7 @@ static PFileVarProto FileVar = NULL;
 static PProtoDlg PtDlg = NULL;
 static BOOL cv_ProtoFlag = FALSE;
 
-static void _SetDlgTime(TFileVarProto *fv, DWORD elapsed, int bytes)
+static void _SetDlgTime(TFileVarProto *fv, ULONGLONG elapsed, int bytes)
 {
 	SetDlgTime(fv->HWin, IDC_PROTOELAPSEDTIME, elapsed, bytes);
 }

teraterm/teraterm/filesys_proto.h

@@ -153,7 +153,7 @@ typedef TFileVarProto *PFileVarProto;
 // UI縺ｪ縺ｩ諠�ｱ陦ｨ遉ｺ逕ｨ髢｢謨ｰ
 typedef struct InfoOp_ {
 	void (*InitDlgProgress)(struct FileVarProto *fv, int *CurProgStat);
-	void (*SetDlgTime)(struct FileVarProto *fv, DWORD elapsed, int bytes);
+	void (*SetDlgTime)(struct FileVarProto *fv, ULONGLONG elapsed, int bytes);
 	void (*SetDlgPacketNum)(struct FileVarProto *fv, LONG Num);
 	void (*SetDlgByteCount)(struct FileVarProto *fv, LONG Num);
 	void (*SetDlgPercent)(struct FileVarProto *fv, LONG a, LONG b, int *p);