mirror/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2025-01-19 15:03:36 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Add error handling for all possible failing of winrt::check_result (#8278)

Browse Source
This commit is contained in:
Mykhailo Pylyp 2020-12-01 12:03:24 +02:00 committed by GitHub
parent c6078e3136
commit d9ca68e6ea
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 37 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/modules/shortcut_guide/shortcut_guide.cpp
View File

@ -233,7 +233,16 @@ void OverlayWindow::enable()
winkey_popup->apply_overlay_opacity(((float)overlayOpacity.value) / 100.0f);
winkey_popup->set_theme(theme.value);
target_state = std::make_unique<TargetState>(pressTime.value);
winkey_popup->initialize();
try
{
winkey_popup->initialize();
}
catch (...)
{
Logger::critical("Winkey popup failed to initialize");
return;
}
#if defined(DISABLE_LOWLEVEL_HOOKS_WHEN_DEBUGGED)
const bool hook_disabled = IsDebuggerPresent();
#else

30
src/modules/shortcut_guide/target_state.cpp
View File

@ -3,6 +3,7 @@
#include "common/start_visible.h"
#include "keyboard_state.h"
#include "common/shared_constants.h"
#include <common\logger\logger.h>
TargetState::TargetState(int ms_delay) :
// TODO: All this processing should be done w/o a separate thread etc. in pre_wnd_proc of winkey_popup to avoid
@ -143,13 +144,36 @@ void TargetState::thread_proc()
handle_hidden();
break;
case Timeout:
handle_timeout();
try
{
handle_timeout();
}
catch (...)
{
Logger::critical("Timeout, handle_timeout failed.");
}
break;
case Shown:
handle_shown(false);
try
{
handle_shown(false);
}
catch (...)
{
Logger::critical("Shown, handle_shown failed.");
}
break;
case ForceShown:
handle_shown(true);
try
{
handle_shown(true);
}
catch (...)
{
Logger::critical("ForceShown, handle_shown failed.");
}
break;
case Exiting:
default: