notifications: provide default app id to fix FZ toast crashes (#5551)
This commit is contained in:
parent
1456be9feb
commit
371523d756
|
@ -90,7 +90,7 @@ int WINAPI WinMain(HINSTANCE, HINSTANCE, LPSTR, int)
|
||||||
{
|
{
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
notifications::set_application_id(APPLICATION_ID);
|
notifications::override_application_id(APPLICATION_ID);
|
||||||
|
|
||||||
fs::path iconPath{ L"C:\\" };
|
fs::path iconPath{ L"C:\\" };
|
||||||
if (auto extractedIcon = extractIcon())
|
if (auto extractedIcon = extractIcon())
|
||||||
|
|
|
@ -30,6 +30,7 @@ using winrt::Windows::UI::Notifications::ToastNotificationManager;
|
||||||
|
|
||||||
namespace fs = std::filesystem;
|
namespace fs = std::filesystem;
|
||||||
|
|
||||||
|
// This namespace contains strings that SHOULD NOT be localized
|
||||||
namespace
|
namespace
|
||||||
{
|
{
|
||||||
constexpr std::wstring_view TASK_NAME = L"PowerToysBackgroundNotificationsHandler";
|
constexpr std::wstring_view TASK_NAME = L"PowerToysBackgroundNotificationsHandler";
|
||||||
|
@ -37,7 +38,7 @@ namespace
|
||||||
constexpr std::wstring_view PACKAGED_APPLICATION_ID = L"PowerToys";
|
constexpr std::wstring_view PACKAGED_APPLICATION_ID = L"PowerToys";
|
||||||
constexpr std::wstring_view APPIDS_REGISTRY = LR"(Software\Classes\AppUserModelId\)";
|
constexpr std::wstring_view APPIDS_REGISTRY = LR"(Software\Classes\AppUserModelId\)";
|
||||||
|
|
||||||
std::wstring APPLICATION_ID;
|
std::wstring APPLICATION_ID = L"Microsoft.PowerToysWin32";
|
||||||
}
|
}
|
||||||
|
|
||||||
namespace localized_strings
|
namespace localized_strings
|
||||||
|
@ -184,7 +185,7 @@ void notifications::unregister_application_id()
|
||||||
RegDeleteKeyW(registryRoot.get(), APPLICATION_ID.data());
|
RegDeleteKeyW(registryRoot.get(), APPLICATION_ID.data());
|
||||||
}
|
}
|
||||||
|
|
||||||
void notifications::set_application_id(const std::wstring_view appID)
|
void notifications::override_application_id(const std::wstring_view appID)
|
||||||
{
|
{
|
||||||
APPLICATION_ID = appID;
|
APPLICATION_ID = appID;
|
||||||
SetCurrentProcessExplicitAppUserModelID(APPLICATION_ID.c_str());
|
SetCurrentProcessExplicitAppUserModelID(APPLICATION_ID.c_str());
|
||||||
|
|
|
@ -10,7 +10,7 @@ namespace notifications
|
||||||
{
|
{
|
||||||
constexpr inline const wchar_t TOAST_ACTIVATED_LAUNCH_ARG[] = L"-ToastActivated";
|
constexpr inline const wchar_t TOAST_ACTIVATED_LAUNCH_ARG[] = L"-ToastActivated";
|
||||||
|
|
||||||
void set_application_id(const std::wstring_view appID);
|
void override_application_id(const std::wstring_view appID);
|
||||||
void register_background_toast_handler();
|
void register_background_toast_handler();
|
||||||
void run_desktop_app_activator_loop();
|
void run_desktop_app_activator_loop();
|
||||||
|
|
||||||
|
|
|
@ -48,7 +48,6 @@ namespace localized_strings
|
||||||
namespace
|
namespace
|
||||||
{
|
{
|
||||||
const wchar_t PT_URI_PROTOCOL_SCHEME[] = L"powertoys://";
|
const wchar_t PT_URI_PROTOCOL_SCHEME[] = L"powertoys://";
|
||||||
const wchar_t APPLICATION_ID[] = L"Microsoft.PowerToysWin32";
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void chdir_current_executable()
|
void chdir_current_executable()
|
||||||
|
@ -305,8 +304,6 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine
|
||||||
{
|
{
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
notifications::set_application_id(APPLICATION_ID);
|
|
||||||
|
|
||||||
int n_cmd_args = 0;
|
int n_cmd_args = 0;
|
||||||
LPWSTR* cmd_arg_list = CommandLineToArgvW(GetCommandLineW(), &n_cmd_args);
|
LPWSTR* cmd_arg_list = CommandLineToArgvW(GetCommandLineW(), &n_cmd_args);
|
||||||
switch (should_run_in_special_mode(n_cmd_args, cmd_arg_list))
|
switch (should_run_in_special_mode(n_cmd_args, cmd_arg_list))
|
||||||
|
|
Loading…
Reference in a new issue