From e1dc15321ad38f7a766a8e551227f4a19a0d15e7 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 14 Apr 2020 15:37:48 +0400
Subject: [PATCH] Work around 32-bitness of GetLastInputInfo.

Fixes #7637.
---
 .../SourceFiles/platform/win/specific_win.cpp | 51 +++++++++++++++++--
 Telegram/lib_base                             |  2 +-
 2 files changed, 49 insertions(+), 4 deletions(-)

diff --git a/Telegram/SourceFiles/platform/win/specific_win.cpp b/Telegram/SourceFiles/platform/win/specific_win.cpp
index 356505422..e94d33764 100644
--- a/Telegram/SourceFiles/platform/win/specific_win.cpp
+++ b/Telegram/SourceFiles/platform/win/specific_win.cpp
@@ -11,6 +11,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "platform/win/notifications_manager_win.h"
 #include "platform/win/windows_app_user_model_id.h"
 #include "platform/win/windows_dlls.h"
+#include "base/call_delayed.h"
 #include "lang/lang_keys.h"
 #include "mainwindow.h"
 #include "mainwidget.h"
@@ -71,6 +72,8 @@ using namespace Platform;
 
 namespace {
 
+constexpr auto kRefreshBadLastUserInputTimeout = 10 * crl::time(1000);
+
 QStringList _initLogs;
 
 bool themeInited = false;
@@ -336,9 +339,51 @@ QString SingleInstanceLocalServerName(const QString &hash) {
 std::optional<crl::time> LastUserInputTime() {
 	auto lii = LASTINPUTINFO{ 0 };
 	lii.cbSize = sizeof(LASTINPUTINFO);
-	return GetLastInputInfo(&lii)
-		? std::make_optional(crl::now() + lii.dwTime - GetTickCount())
-		: std::nullopt;
+	if (!GetLastInputInfo(&lii)) {
+		return std::nullopt;
+	}
+	const auto now = crl::now();
+	const auto input = crl::time(lii.dwTime);
+	static auto LastTrackedInput = input;
+	static auto LastTrackedWhen = now;
+
+	const auto ticks32 = crl::time(GetTickCount());
+	const auto ticks64 = crl::time(GetTickCount64());
+	const auto elapsed = std::max(ticks32, ticks64) - input;
+	const auto good = (std::abs(ticks32 - ticks64) <= crl::time(1000))
+		&& (elapsed >= 0);
+	if (good) {
+		LastTrackedInput = input;
+		LastTrackedWhen = now;
+		return (now > elapsed) ? (now - elapsed) : crl::time(0);
+	}
+
+	static auto WaitingDelayed = false;
+	if (!WaitingDelayed) {
+		WaitingDelayed = true;
+		base::call_delayed(kRefreshBadLastUserInputTimeout, [=] {
+			WaitingDelayed = false;
+			[[maybe_unused]] const auto cheked = LastUserInputTime();
+		});
+	}
+	constexpr auto OverrunLimit = std::numeric_limits<DWORD>::max();
+	constexpr auto OverrunThreshold = OverrunLimit / 4;
+	if (LastTrackedInput == input) {
+		return LastTrackedWhen;
+	}
+	const auto guard = gsl::finally([&] {
+		LastTrackedInput = input;
+		LastTrackedWhen = now;
+	});
+	if (input > LastTrackedInput) {
+		const auto add = input - LastTrackedInput;
+		return std::min(LastTrackedWhen + add, now);
+	} else if (crl::time(OverrunLimit) + input - LastTrackedInput
+		< crl::time(OverrunThreshold)) {
+		const auto add = crl::time(OverrunLimit) + input - LastTrackedInput;
+		return std::min(LastTrackedWhen + add, now);
+	}
+	return LastTrackedWhen;
 }
 
 } // namespace Platform
diff --git a/Telegram/lib_base b/Telegram/lib_base
index eedb8afcf..f8f796038 160000
--- a/Telegram/lib_base
+++ b/Telegram/lib_base
@@ -1 +1 @@
-Subproject commit eedb8afcf5f1709f3e02db9b06b977bb57aca182
+Subproject commit f8f796038cc936948ef223a22ec548aa63f48aeb