マクロ整数型を 64-bit に拡張 (int64型・uptime64コマンドを廃止)

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

@@ -29,7 +29,8 @@ <h2>Remarks</h2>
 </p>
 
 <p>
-The time wraps around to zero if the system is run continuously for 49.7 days.
+Since version 5.7.0, the value is stored as a 64-bit integer,
+so it will not wrap around even if the system is run continuously for more than 49.7 days.
 </p>
 
 

doc/en/html/macro/syntax/types.html

@@ -17,7 +17,7 @@ <h1>Types</h1>
 
 <h2 id="Integer">1) Integer</h2>
 <p>
-Signed 32 bit, from -2147483648 to 2147483647.<br />
+Signed 64 bit, from -9223372036854775808 to 9223372036854775807.<br />
 Floating point operation is not supported.
 </p>
 

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

@@ -28,7 +28,7 @@ <h1>uptime</h1>
 </p>
 
 <p>
-���ғ����Ԃ�49�����o�߂���ƁA0�ɖ߂�B
+�o�[�W����5.7.0�ȍ~��64�r�b�g�����Ƃ��Ċi�[���邽�߁A49���𒴂��Ă�0�ɖ߂邱�Ƃ͂Ȃ��B
 </p>
 
 

doc/ja/html/macro/syntax/types.html

@@ -17,7 +17,7 @@
 
 <h2 id="Integer">1) ����</h2>
 <p>
-�����t�� 32 bit�A-2147483648����2147483647�܂ŁB<br />
+�����t�� 64 bit�A-9223372036854775808����9223372036854775807�܂ŁB<br />
 ���������_�͖��T�|�[�g�B
 </p>
 

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;			// クリックした文字cell
 static POINT SelectStartOld;	// 描画した選択領域、start
 static POINT SelectEndOld;		// 描画した選択領域、end
-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);

teraterm/teraterm/ftdlg.cpp

@@ -151,31 +151,31 @@ void CFileTransDlg::ChangeButton(BOOL PauseFlag)
 	}
 }
 
-void CFileTransDlg::RefreshNum(DWORD StartTime, LONG FileSize, LONG ByteCount)
+void CFileTransDlg::RefreshNum(ULONGLONG StartTime, LONG FileSize, LONG ByteCount)
 {
 	char NumStr[24];
 	double rate;
 	int rate2;
-	static DWORD prev_elapsed;
-	DWORD elapsed;
+	static ULONGLONG prev_elapsed;
+	ULONGLONG elapsed;
 
 	if (OpId == OpSendFile) {
 		if (StartTime == 0) {
 			SetDlgItemText(IDC_TRANS_ETIME, "0:00");
 			prev_elapsed = 0;
 		}
 		else {
-			elapsed = (GetTickCount() - StartTime) / 1000;
+			elapsed = (GetTickCount64() - StartTime) / 1000;
 			if (elapsed != prev_elapsed && elapsed != 0) {
-				rate2 = ByteCount / elapsed;
+				rate2 = (int)(ByteCount / elapsed);
 				if (rate2 < 1200) {
-					_snprintf_s(NumStr, sizeof(NumStr), _TRUNCATE, "%d:%02d (%dBytes/s)", elapsed / 60, elapsed % 60, rate2);
+					_snprintf_s(NumStr, sizeof(NumStr), _TRUNCATE, "%llu:%02llu (%dBytes/s)", elapsed / 60, elapsed % 60, rate2);
 				}
 				else if (rate2 < 1200000) {
-					_snprintf_s(NumStr, sizeof(NumStr), _TRUNCATE, "%d:%02d (%d.%02dKB/s)", elapsed / 60, elapsed % 60, rate2 / 1000, rate2 / 10 % 100);
+					_snprintf_s(NumStr, sizeof(NumStr), _TRUNCATE, "%llu:%02llu (%d.%02dKB/s)", elapsed / 60, elapsed % 60, rate2 / 1000, rate2 / 10 % 100);
 				}
 				else {
-					_snprintf_s(NumStr, sizeof(NumStr), _TRUNCATE, "%d:%02d (%d.%02dMB/s)", elapsed / 60, elapsed % 60, rate2 / (1000*1000), rate2 / 10000 % 100);
+					_snprintf_s(NumStr, sizeof(NumStr), _TRUNCATE, "%llu:%02llu (%d.%02dMB/s)", elapsed / 60, elapsed % 60, rate2 / (1000*1000), rate2 / 10000 % 100);
 				}
 				SetDlgItemText(IDC_TRANS_ETIME, NumStr);
 				prev_elapsed = elapsed;

teraterm/teraterm/ftdlg.h

@@ -57,7 +57,7 @@ class CFileTransDlg : public TTCDialog
 
 	BOOL Create(HINSTANCE hInstance, Info *info);
 	void ChangeButton(BOOL PauseFlag);
-	void RefreshNum(DWORD StartTime, LONG FileSize, LONG ByteCount);
+	void RefreshNum(ULONGLONG StartTime, LONG FileSize, LONG ByteCount);
 
 private:
 	virtual BOOL OnCancel();

teraterm/teraterm/ftdlg_lite.cpp

@@ -174,8 +174,8 @@ class PrivateData : public TTCDialog
 	BOOL Pause;
 	BOOL check_2sec;
 	BOOL show;
-	DWORD prev_elapsed;
-	DWORD StartTime;
+	ULONGLONG prev_elapsed;
+	ULONGLONG StartTime;
 	BOOL HideDialog;
 
 	CFileTransLiteDlg::Observer *observer_;
@@ -215,7 +215,7 @@ BOOL CFileTransLiteDlg::Create(HINSTANCE hInstance, HWND hParent, const wchar_t
 	}
 
 	pData->SetDlgItemTextA(IDC_TRANS_ETIME, "0:00");
-	pData->StartTime = GetTickCount();
+	pData->StartTime = GetTickCount64();
 	pData->prev_elapsed = 0;
 
 	return Ok;
@@ -232,10 +232,10 @@ void CFileTransLiteDlg::RefreshNum(size_t ByteCount, size_t FileSize)
 		return;
 	}
 
-	const DWORD now = GetTickCount();
+	const ULONGLONG now = GetTickCount64();
 
 	if (!pData->check_2sec) {
-		DWORD elapsed_ms = now - pData->StartTime;
+		ULONGLONG elapsed_ms = now - pData->StartTime;
 		if (elapsed_ms > 2 * 1000) {
 			// 2sec経過
 			pData->check_2sec = TRUE;
@@ -247,10 +247,10 @@ void CFileTransLiteDlg::RefreshNum(size_t ByteCount, size_t FileSize)
 	}
 
 	char NumStr[24];
-	DWORD elapsed = (now - pData->StartTime) / 1000;
+	ULONGLONG elapsed = (now - pData->StartTime) / 1000;
 	if (elapsed != pData->prev_elapsed && elapsed != 0) {
 		char elapsed_str[24];
-		_snprintf_s(elapsed_str, sizeof(elapsed_str), _TRUNCATE, "%ld:%02ld",
+		_snprintf_s(elapsed_str, sizeof(elapsed_str), _TRUNCATE, "%llu:%02llu",
 					elapsed / 60, elapsed % 60);
 
 		char speed_str[24];