From 47195e316f18a32f132aa28ea44820620ea5a11b Mon Sep 17 00:00:00 2001 From: Ilya Fedin Date: Fri, 11 Aug 2023 03:58:10 +0400 Subject: [PATCH] Don't load SetCurrentProcessExplicitAppUserModelID dynamically It's supported since Windows 7 --- .../platform/win/notifications_manager_win.cpp | 8 ++------ Telegram/SourceFiles/platform/win/windows_dlls.cpp | 1 - Telegram/SourceFiles/platform/win/windows_dlls.h | 2 -- 3 files changed, 2 insertions(+), 9 deletions(-) diff --git a/Telegram/SourceFiles/platform/win/notifications_manager_win.cpp b/Telegram/SourceFiles/platform/win/notifications_manager_win.cpp index 83c543fe0..0f2c05d74 100644 --- a/Telegram/SourceFiles/platform/win/notifications_manager_win.cpp +++ b/Telegram/SourceFiles/platform/win/notifications_manager_win.cpp @@ -107,11 +107,7 @@ crl::time LastSettingsQueryMs/* = 0*/; } bool init() { - if (!IsWindows8OrGreater()) { - return false; - } - if ((Dlls::SetCurrentProcessExplicitAppUserModelID == nullptr) - || !base::WinRT::Supported()) { + if (!IsWindows8OrGreater() || !base::WinRT::Supported()) { return false; } @@ -128,7 +124,7 @@ bool init() { } auto appUserModelId = AppUserModelId::getId(); - if (!SUCCEEDED(Dlls::SetCurrentProcessExplicitAppUserModelID(appUserModelId))) { + if (!SUCCEEDED(SetCurrentProcessExplicitAppUserModelID(appUserModelId))) { return false; } return true; diff --git a/Telegram/SourceFiles/platform/win/windows_dlls.cpp b/Telegram/SourceFiles/platform/win/windows_dlls.cpp index f728fcce2..7184b2f4b 100644 --- a/Telegram/SourceFiles/platform/win/windows_dlls.cpp +++ b/Telegram/SourceFiles/platform/win/windows_dlls.cpp @@ -34,7 +34,6 @@ SafeIniter::SafeIniter() { LOAD_SYMBOL(LibShell32, OpenAs_RunDLL); LOAD_SYMBOL(LibShell32, SHQueryUserNotificationState); LOAD_SYMBOL(LibShell32, SHChangeNotify); - LOAD_SYMBOL(LibShell32, SetCurrentProcessExplicitAppUserModelID); //if (IsWindows10OrGreater()) { // static const auto kSystemVersion = QOperatingSystemVersion::current(); diff --git a/Telegram/SourceFiles/platform/win/windows_dlls.h b/Telegram/SourceFiles/platform/win/windows_dlls.h index b3695f269..eef6e9bc7 100644 --- a/Telegram/SourceFiles/platform/win/windows_dlls.h +++ b/Telegram/SourceFiles/platform/win/windows_dlls.h @@ -65,8 +65,6 @@ inline void(__stdcall *SHChangeNotify)( UINT uFlags, __in_opt LPCVOID dwItem1, __in_opt LPCVOID dwItem2); -inline HRESULT(__stdcall *SetCurrentProcessExplicitAppUserModelID)( - __in PCWSTR AppID); // PROPSYS.DLL