Add Act.

1 files changed, 8 insertions, 3 deletions

diff --git a/c/main.cpp b/c/main.cpp
index ea12db9..82cda68 100644
--- a/c/main.cpp
+++ b/c/main.cpp
@@ -124,11 +124,13 @@ static void InitializeMainWindow_(const HWND hWnd)
 	 * initializes global variables that are used by WndProc. */
 
 	/* Look up DPI. */
+	Act(L"looking up DPI");
 	if (auto lib = Library::Maybe(L"User32.dll");
 	    auto GetDpiForWindow = lib? lib->GetProcAddress<UINT(HWND)>("GetDpiForWindow"): nullptr)
 		g_dpi = GetDpiForWindow(hWnd);
 
 	/* Load normal font. */
+	Act(L"loading fonts");
 	if (auto lib = Library::Maybe(L"User32.dll");
 	    lib && lib->GetProcAddress<void>("SystemParametersInfoW")) {
 		NONCLIENTMETRICSW m = {sizeof(NONCLIENTMETRICSW)};
@@ -156,6 +158,7 @@ static void InitializeMainWindow_(const HWND hWnd)
 		SetWindowTheme = (decltype(SetWindowTheme))(void*)GetProcAddress(hModule, "SetWindowTheme");
 	}
 
+	Act(L"setting up main window");
 	g_window = new Window(hWnd);
 }
 
@@ -164,17 +167,18 @@ void InitializeMainWindow(const HWND hWnd) noexcept
 	try {
 		InitializeMainWindow_(hWnd);
 	} catch (...) {
-		ShowException(L"Initialization failed due to an error: %s");
+		ShowException(L"Initialization failed due to an error while %s: %s");
 		exit(1);
 	}
 }
 
 LRESULT CALLBACK WndProc(const HWND hWnd, const UINT uMsg, const WPARAM wParam, const LPARAM lParam)
 {
+	Act(nullptr);
 	try {
 		return g_window->WndProc(hWnd, uMsg, wParam, lParam);
 	} catch (...) {
-		ShowException(L"The action was cancelled due to an error: %s");
+		ShowException(L"The action was cancelled due to an error while %s: %s");
 	}
 	return DefWindowProc(hWnd, uMsg, wParam, lParam);
 }
@@ -200,6 +204,7 @@ LRESULT CALLBACK Window::WndProc(const HWND hWnd, const UINT uMsg, const WPARAM
 {
 	switch (uMsg) {
 	case WM_CREATE:
+		Act(L"creating main window");
 		UpdateTheme();
 		SetWindowPos(hWnd, nullptr, -1, -1, Dpi(510), Dpi(412), SWP_NOZORDER|SWP_NOMOVE|SWP_NOACTIVATE);
 		SetFocus(elv.hWnd);
@@ -426,7 +431,7 @@ void Window::HandleMainMenu(const HWND hWnd, const WORD command)
 	}
 }
 
-void Window::Status(const wchar_t* msg, unsigned short i)
+void Window::Status(const wchar_t* msg, unsigned short i) noexcept
 {
 	SendMessage(hWndStatus, SB_SETTEXT, MAKEWPARAM(i, 0), reinterpret_cast<LPARAM>(msg));
 }