diff --git a/TTProxy/ProxyWSockHook.h b/TTProxy/ProxyWSockHook.h
index a571a641e..be2725d51 100644
--- a/TTProxy/ProxyWSockHook.h
+++ b/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(§ion);
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;
}
};
diff --git a/doc/en/html/macro/command/uptime64.html b/doc/en/html/macro/command/uptime64.html
new file mode 100644
index 000000000..06a900d5f
--- /dev/null
+++ b/doc/en/html/macro/command/uptime64.html
@@ -0,0 +1,69 @@
+
+
+
+ uptime64
+ uptime64
+
+
+Gets System Up Time. (version 5.7.0 or later)
+
+
+
+int64 <var>
+uptime64 <var>
+
+
+Remarks
+
+
+Retrieves the number of milliseconds that have elapsed since the Windows OS was started,
+and then stores the value into the <int64var> variable.
+
+
+
+The time is valid after the system is run continuously for 49.7 days.
+
+
+
+Example
+
+
+; How to get the uptime in Windows
+int64 var
+uptime64 var
+day = var / 86400000
+var = var % 86400000
+hour = var / 3600000
+var = var % 3600000
+min = var / 60000
+var = var % 60000
+sec = var / 1000
+
+sprintf2 str "System Up Time: %d Days, %d Hours, %d Minutes, %d Seconds" day hour min sec
+messagebox str "uptime"
+
+
+
+int64 varstart
+int64 varend
+uptime64 varstart
+
+; do something...
+
+uptime64 varend
+diff = varend - varstart
+sprintf2 str "MACRO running time: %d msec" diff
+messagebox str "running time"
+
+
+
+
diff --git a/doc/en/teraterm.hhc b/doc/en/teraterm.hhc
index 21144538b..8fd5b586b 100644
--- a/doc/en/teraterm.hhc
+++ b/doc/en/teraterm.hhc
@@ -1991,6 +1991,11 @@
+
uptime64
+ uptime64
+
+
+OS‚̉ғŽžŠÔ‚ðŽæ“¾‚·‚éB(ƒo[ƒWƒ‡ƒ“5.7.0ˆÈ~)
+
+
+
+int64 <var>
+uptime64 <var>
+
+
+‰ðà
+
+
+Windows OS‚̉ғŽžŠÔiƒ~ƒŠ•bj‚ð <int64var> ‚ÉŠi”[‚·‚éB
+
+
+
+¦‰Ò“ŽžŠÔ‚ª49“ú‚ðŒo‰ß‚µ‚Ä‚à—LŒø
+
+
+
+—á
+
+
+; How to get the uptime in Windows
+int64 var
+uptime64 var
+day = var / 86400000
+var = var % 86400000
+hour = var / 3600000
+var = var % 3600000
+min = var / 60000
+var = var % 60000
+sec = var / 1000
+
+sprintf2 str "System Up Time: %d Days, %d Hours, %d Minutes, %d Seconds" day hour min sec
+messagebox str "uptime"
+
+
+
+int64 varstart
+int64 varend
+uptime64 varstart
+
+; do something...
+
+uptime64 varend
+diff = varend - varstart
+sprintf2 str "MACRO running time: %d msec" diff
+messagebox str "running time"
+
+
+
+
diff --git a/doc/ja/teraterm.hhc b/doc/ja/teraterm.hhc
index edf9456bf..71004fdd4 100644
--- a/doc/ja/teraterm.hhc
+++ b/doc/ja/teraterm.hhc
@@ -2014,6 +2014,11 @@
+
+