From ee9f99a754c3daea037bd37df6e3d2a0956cf6a9 Mon Sep 17 00:00:00 2001 From: John Preston Date: Wed, 17 Jul 2024 12:25:27 +0200 Subject: [PATCH] Add some Windows on ARM special cases. --- Telegram/SourceFiles/boxes/about_box.cpp | 4 ++++ Telegram/SourceFiles/core/crash_reports.cpp | 6 +++++- Telegram/lib_base | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/Telegram/SourceFiles/boxes/about_box.cpp b/Telegram/SourceFiles/boxes/about_box.cpp index 6d001d4075..75674299f8 100644 --- a/Telegram/SourceFiles/boxes/about_box.cpp +++ b/Telegram/SourceFiles/boxes/about_box.cpp @@ -100,6 +100,8 @@ void AboutBox::showVersionHistory() { url += u"win/%1.zip"_q; } else if (Platform::IsWindows64Bit()) { url += u"win64/%1.zip"_q; + } else if (Platform::IsWindowsARM64()) { + url += u"winarm/%1.zip"_q; } else if (Platform::IsMac()) { url += u"mac/%1.zip"_q; } else if (Platform::IsLinux()) { @@ -155,6 +157,8 @@ QString currentVersionText() { } if (Platform::IsWindows64Bit()) { result += " x64"; + } else if (Platform::IsWindowsARM64()) { + result += " arm64"; } return result; } diff --git a/Telegram/SourceFiles/core/crash_reports.cpp b/Telegram/SourceFiles/core/crash_reports.cpp index 6f4e2d4663..1e38d721ad 100644 --- a/Telegram/SourceFiles/core/crash_reports.cpp +++ b/Telegram/SourceFiles/core/crash_reports.cpp @@ -296,13 +296,17 @@ bool DumpCallback(const google_breakpad::MinidumpDescriptor &md, void *context, QString PlatformString() { if (Platform::IsWindowsStoreBuild()) { - return Platform::IsWindows64Bit() + return Platform::IsWindowsARM64() + ? u"WinStoreARM64"_q + : Platform::IsWindows64Bit() ? u"WinStore64Bit"_q : u"WinStore32Bit"_q; } else if (Platform::IsWindows32Bit()) { return u"Windows32Bit"_q; } else if (Platform::IsWindows64Bit()) { return u"Windows64Bit"_q; + } else if (Platform::IsWindowsARM64()) { + return u"WindowsARM64"_q; } else if (Platform::IsMacStoreBuild()) { return u"MacAppStore"_q; } else if (Platform::IsMac()) { diff --git a/Telegram/lib_base b/Telegram/lib_base index 1a50fd2300..54639131bf 160000 --- a/Telegram/lib_base +++ b/Telegram/lib_base @@ -1 +1 @@ -Subproject commit 1a50fd2300da3198e751a22bf728d33822180e15 +Subproject commit 54639131bf1e5dce87c10dba45062cfec804e343