mir/PowerToys
2
0
Fork 0
mirror of https://github.com/microsoft/PowerToys synced 2025-08-31 22:45:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

error handling and error checking

Browse Source
This commit is contained in:
Enrico Giordani
2019-10-03 10:43:50 +02:00
committed by Enrico Giordani
parent 7a94ee04c8
commit c00733ea11
1 changed files with 56 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

98
src/editor/main.cpp
View File

@@ -31,11 +31,11 @@ using namespace winrt::Windows::Web::UI;
using namespace winrt::Windows::Web::UI::Interop; using namespace winrt::Windows::Web::UI::Interop;
using namespace winrt::Windows::System; using namespace winrt::Windows::System;
HINSTANCE g_hinst; HINSTANCE g_hinst = nullptr;
HWND g_main_wnd = nullptr; HWND g_main_wnd = nullptr;
WebViewControl g_webview = nullptr; WebViewControl g_webview = nullptr;
WebViewControlProcess g_webview_process = nullptr; WebViewControlProcess g_webview_process = nullptr;
StreamUriResolverFromFile local_uri_resolver; StreamUriResolverFromFile local_uri_resolver;
// Windows message for receiving copied data to send to the webview. // Windows message for receiving copied data to send to the webview.
@@ -65,8 +65,8 @@ void NavigateToLocalhostReactServer() {
void NavigateToUri(_In_ LPCWSTR uri_as_string) { void NavigateToUri(_In_ LPCWSTR uri_as_string) {
// initialize the base_path for the html content relative to the executable. // initialize the base_path for the html content relative to the executable.
GetModuleFileName(nullptr, local_uri_resolver.base_path, MAX_PATH); WINRT_VERIFY(GetModuleFileName(nullptr, local_uri_resolver.base_path, MAX_PATH));
PathRemoveFileSpec(local_uri_resolver.base_path); WINRT_VERIFY(PathRemoveFileSpec(local_uri_resolver.base_path));
wcscat_s(local_uri_resolver.base_path, URI_CONTENT_ID); wcscat_s(local_uri_resolver.base_path, URI_CONTENT_ID);
Uri url = g_webview.BuildLocalStreamUri(hstring(URI_CONTENT_ID), hstring(uri_as_string)); Uri url = g_webview.BuildLocalStreamUri(hstring(URI_CONTENT_ID), hstring(uri_as_string));
g_webview.NavigateToLocalStreamUri(url, local_uri_resolver); g_webview.NavigateToLocalStreamUri(url, local_uri_resolver);
@@ -74,7 +74,7 @@ void NavigateToUri(_In_ LPCWSTR uri_as_string) {
Rect client_rect_to_bounds_rect(_In_ HWND hwnd) { Rect client_rect_to_bounds_rect(_In_ HWND hwnd) {
RECT client_rect = { 0 }; RECT client_rect = { 0 };
GetClientRect(hwnd, &client_rect); WINRT_VERIFY(GetClientRect(hwnd, &client_rect));
Rect bounds = Rect bounds =
{ {
@@ -112,7 +112,7 @@ void send_message_to_webview(const std::wstring& msg) {
message->dwData = SEND_TO_WEBVIEW_MSG; message->dwData = SEND_TO_WEBVIEW_MSG;
message->cbData = buff_size * sizeof(wchar_t); message->cbData = buff_size * sizeof(wchar_t);
message->lpData = (PVOID)buffer; message->lpData = (PVOID)buffer;
PostMessage(g_main_wnd, wm_data_for_webview, (WPARAM)g_main_wnd, (LPARAM)message); WINRT_VERIFY(PostMessage(g_main_wnd, wm_data_for_webview, (WPARAM)g_main_wnd, (LPARAM)message));
} }
} }
@@ -196,7 +196,7 @@ void receive_message_from_webview(const std::wstring& msg) {
// It's not a JSON string, check for expected control messages. // It's not a JSON string, check for expected control messages.
if (msg == L"exit") { if (msg == L"exit") {
// WebView confirms the settings application can exit. // WebView confirms the settings application can exit.
PostMessage(g_main_wnd, wm_destroy_window, 0, 0); WINRT_VERIFY(PostMessage(g_main_wnd, wm_destroy_window, 0, 0));
} else if (msg == L"cancel-exit") { } else if (msg == L"cancel-exit") {
// WebView canceled the exit request. // WebView canceled the exit request.
g_waiting_for_close_confirmation = false; g_waiting_for_close_confirmation = false;
@@ -208,44 +208,56 @@ void initialize_webview(HWND hwnd, int nCmdShow) {
try { try {
if (!g_webview_process) { if (!g_webview_process) {
g_webview_process = WebViewControlProcess(); g_webview_process = WebViewControlProcess();
WINRT_VERIFY(g_webview_process);
} }
auto asyncwebview = g_webview_process.CreateWebViewControlAsync((int64_t)g_main_wnd, client_rect_to_bounds_rect(g_main_wnd)); auto asyncwebview = g_webview_process.CreateWebViewControlAsync((int64_t)g_main_wnd, client_rect_to_bounds_rect(g_main_wnd));
asyncwebview.Completed([=](IAsyncOperation<WebViewControl> const& sender, AsyncStatus args) { asyncwebview.Completed([=](IAsyncOperation<WebViewControl> const& sender, AsyncStatus status) {
g_webview = sender.GetResults(); if (status == AsyncStatus::Completed) {
WINRT_VERIFY(sender);
// In order to receive window.external.notify() calls in ScriptNotify g_webview = sender.GetResults();
g_webview.Settings().IsScriptNotifyAllowed(true); WINRT_VERIFY(g_webview);
g_webview.Settings().IsJavaScriptEnabled(true); // In order to receive window.external.notify() calls in ScriptNotify
g_webview.Settings().IsScriptNotifyAllowed(true);
g_webview.NewWindowRequested([=](IWebViewControl sender_requester, WebViewControlNewWindowRequestedEventArgs args ) {
// Open the requested link in the default browser registered in the Shell
ShellExecute(nullptr, L"open", args.Uri().AbsoluteUri().c_str(), nullptr, nullptr, SW_SHOWNORMAL);
});
g_webview.DOMContentLoaded([=](IWebViewControl sender_loaded, WebViewControlDOMContentLoadedEventArgs const& args_loaded) { g_webview.Settings().IsJavaScriptEnabled(true);
// runs when the content has been loaded.
}); g_webview.NewWindowRequested([=](IWebViewControl sender_requester, WebViewControlNewWindowRequestedEventArgs args) {
g_webview.ScriptNotify([=](IWebViewControl sender_script_notify, WebViewControlScriptNotifyEventArgs const& args_script_notify) { // Open the requested link in the default browser registered in the Shell
// content called window.external.notify() int res = (int)ShellExecute(nullptr, L"open", args.Uri().AbsoluteUri().c_str(), nullptr, nullptr, SW_SHOWNORMAL);
std::wstring message_sent = args_script_notify.Value().c_str(); WINRT_VERIFY(res > 32);
receive_message_from_webview(message_sent); });
});
g_webview.AcceleratorKeyPressed([&](IWebViewControl sender, WebViewControlAcceleratorKeyPressedEventArgs const& args) { g_webview.DOMContentLoaded([=](IWebViewControl sender_loaded, WebViewControlDOMContentLoadedEventArgs const& args_loaded) {
if (args.VirtualKey() == winrt::Windows::System::VirtualKey::F4) { // runs when the content has been loaded.
// WebView swallows key-events. Detect Alt-F4 one and close the window manually. });
const auto _ = g_webview.InvokeScriptAsync(hstring(L"exit_settings_app"), {}); g_webview.ScriptNotify([=](IWebViewControl sender_script_notify, WebViewControlScriptNotifyEventArgs const& args_script_notify) {
} // content called window.external.notify()
}); std::wstring message_sent = args_script_notify.Value().c_str();
resize_web_view(); receive_message_from_webview(message_sent);
});
g_webview.AcceleratorKeyPressed([&](IWebViewControl sender, WebViewControlAcceleratorKeyPressedEventArgs const& args) {
if (args.VirtualKey() == winrt::Windows::System::VirtualKey::F4) {
// WebView swallows key-events. Detect Alt-F4 one and close the window manually.
const auto _ = g_webview.InvokeScriptAsync(hstring(L"exit_settings_app"), {});
}
});
resize_web_view();
#if defined(_DEBUG) && _DEBUG_WITH_LOCALHOST #if defined(_DEBUG) && _DEBUG_WITH_LOCALHOST
// navigates to localhost:8080 // Navigates to localhost:8080
NavigateToLocalhostReactServer(); NavigateToLocalhostReactServer();
#else #else
// navigates to settings-html/index.html // Navigates to settings-html/index.html.
ShowWindow(g_main_wnd, nCmdShow); ShowWindow(g_main_wnd, nCmdShow);
NavigateToUri(L"index.html"); NavigateToUri(L"index.html");
#endif #endif
} else if (status == AsyncStatus::Error) {
// TODO: report the error and quit, or try to use WebView2.
} else if (status == AsyncStatus::Started) {
// Ignore.
} else if (status == AsyncStatus::Canceled) {
// Ignore.
}
}); });
} }
catch (hresult_error const& e) { catch (hresult_error const& e) {
@@ -342,7 +354,7 @@ void register_classes(HINSTANCE hInstance) {
wcex.lpszClassName = L"PTSettingsClass"; wcex.lpszClassName = L"PTSettingsClass";
wcex.hIconSm = nullptr; wcex.hIconSm = nullptr;
RegisterClassExW(&wcex); WINRT_VERIFY(RegisterClassExW(&wcex));
} }
int init_instance(HINSTANCE hInstance, int nShowCmd) { int init_instance(HINSTANCE hInstance, int nShowCmd) {
@@ -350,7 +362,8 @@ int init_instance(HINSTANCE hInstance, int nShowCmd) {
RECT desktopRect; RECT desktopRect;
const HWND hDesktop = GetDesktopWindow(); const HWND hDesktop = GetDesktopWindow();
GetWindowRect(hDesktop, &desktopRect); WINRT_VERIFY(hDesktop);
WINRT_VERIFY(GetWindowRect(hDesktop, &desktopRect));
int wind_width = 1024; int wind_width = 1024;
int wind_height = 700; int wind_height = 700;
@@ -369,8 +382,9 @@ int init_instance(HINSTANCE hInstance, int nShowCmd) {
hInstance, hInstance,
nullptr); nullptr);
WINRT_VERIFY(g_main_wnd);
initialize_webview(g_main_wnd, nShowCmd); initialize_webview(g_main_wnd, nShowCmd);
UpdateWindow(g_main_wnd); WINRT_VERIFY(UpdateWindow(g_main_wnd));
return TRUE; return TRUE;
} }
@@ -385,7 +399,7 @@ void wait_on_parent_process_thread(DWORD pid) {
// Send a terminated message only after the window has finished initializing. // Send a terminated message only after the window has finished initializing.
std::unique_lock lock(g_window_created); std::unique_lock lock(g_window_created);
} }
PostMessage(g_main_wnd, wm_destroy_window, 0, 0); WINRT_VERIFY(PostMessage(g_main_wnd, wm_destroy_window, 0, 0));
} else { } else {
CloseHandle(process); CloseHandle(process);
} }