RepoMirrors
/
tdesktop
mirror of https://github.com/telegramdesktop/tdesktop
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Beta version 3.1.6: Fix crash on old Windows 10 versions.

This commit is contained in:
John Preston 2021-10-06 17:36:30 +04:00
parent 937c2d3dce
commit 8b7cd4a0c7
2 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
Telegram/SourceFiles/platform/win/notifications_manager_win.cpp
View File

@ -109,9 +109,13 @@ bool init() {
{
using namespace Microsoft::WRL;
Module<OutOfProc>::GetModule().RegisterObjects();
const auto hr = Module<OutOfProc>::GetModule().RegisterObjects();
if (!SUCCEEDED(hr)) {
LOG(("App Error: Object registration failed."));
}
}
if (!AppUserModelId::validateShortcut()) {
LOG(("App Error: Shortcut validation failed."));
return false;
}
@ -707,8 +711,19 @@ bool Manager::Private::showNotificationInTryCatch(
const auto string = &ToastActivation::String;
if (const auto args = object.try_as<ToastActivatedEventArgs>()) {
activation.args = string(args.Arguments().c_str());
const auto reply = args.UserInput().TryLookup(L"fastReply");
const auto data = reply.try_as<IReference<winrt::hstring>>();
const auto args2 = args.try_as<IToastActivatedEventArgs2>();
if (!args2 && activation.args.startsWith("action=reply&")) {
LOG(("WinRT Error: "
"FastReply without IToastActivatedEventArgs2 support."));
return;
}
const auto input = args2 ? args2.UserInput() : nullptr;
const auto reply = input
? input.TryLookup(L"fastReply")
: nullptr;
const auto data = reply
? reply.try_as<IReference<winrt::hstring>>()
: nullptr;
if (data) {
activation.input.push_back({
.key = u"fastReply"_q,
@ -741,7 +756,7 @@ bool Manager::Private::showNotificationInTryCatch(
}
});
const auto token3 = toast.Failed([=](
const auto &sender,
const ToastNotification &sender,
const ToastFailedEventArgs &args) {
performOnMainQueue([notificationId](Manager *manager) {
manager->clearNotification(notificationId);

6
Telegram/SourceFiles/platform/win/windows_app_user_model_id.cpp
View File

@ -273,6 +273,7 @@ bool validateShortcutAt(const QString &path) {
const auto bad2 = !good2 && (toastActivatorPropVar.vt != VT_EMPTY);
PropVariantClear(&toastActivatorPropVar);
if (good1 && good2) {
LOG(("App Info: Shortcut validated at \"%1\"").arg(path));
return true;
} else if (bad1 || bad2) {
return false;
@ -300,9 +301,11 @@ bool validateShortcutAt(const QString &path) {
if (!SUCCEEDED(hr)) return false;
if (persistFile->IsDirty() == S_OK) {
persistFile->Save(p.c_str(), TRUE);
hr = persistFile->Save(p.c_str(), TRUE);
if (!SUCCEEDED(hr)) return false;
}
LOG(("App Info: Shortcut set and validated at \"%1\"").arg(path));
return true;
}
@ -400,6 +403,7 @@ bool validateShortcut() {
TRUE);
if (!SUCCEEDED(hr)) return false;
LOG(("App Info: Shortcut created and validated at \"%1\"").arg(path));
return true;
}