From ec94565cb90134dfedd585a45c8266cc2e21ef4c Mon Sep 17 00:00:00 2001
From: Mark Jansen <learn0more@gmail.com>
Date: Thu, 6 Apr 2017 00:10:53 +0200
Subject: winrt: Show some exceptions

---
 src/fe-gtk/notifications/notification-winrt.cpp | 36 ++++++++++++++++++++++---
 1 file changed, 33 insertions(+), 3 deletions(-)

(limited to 'src/fe-gtk/notifications/notification-winrt.cpp')

diff --git a/src/fe-gtk/notifications/notification-winrt.cpp b/src/fe-gtk/notifications/notification-winrt.cpp
index 338214ee..3b966cf0 100644
--- a/src/fe-gtk/notifications/notification-winrt.cpp
+++ b/src/fe-gtk/notifications/notification-winrt.cpp
@@ -22,6 +22,7 @@
 
 #include <string>
 #include <codecvt>
+#include <strsafe.h>
 
 #include <roapi.h>
 #include <windows.ui.notifications.h>
@@ -38,6 +39,14 @@ widen(const std::string & to_widen)
 	return converter.from_bytes(to_widen);
 }
 
+static std::string
+narrow(const std::wstring & to_narrow)
+{
+	std::wstring_convert<std::codecvt_utf8<wchar_t>> converter;
+	return converter.to_bytes(to_narrow);
+}
+
+
 extern "C"
 {
 	__declspec (dllexport) void
@@ -74,13 +83,34 @@ extern "C"
 	}
 
 	__declspec (dllexport) int
-	notification_backend_init (void)
+	notification_backend_init (const char **error)
 	{
-		if (!notifier)
-			notifier = ToastNotificationManager::CreateToastNotifier (L"HexChat.Desktop.Notify");
+		try
+		{
+			if (!notifier)
+				notifier = ToastNotificationManager::CreateToastNotifier (L"HexChat.Desktop.Notify");
+		}
+		catch (Platform::Exception ^ ex)
+		{
+			static char exc_message[1024];
+			std::string tmp = narrow(std::wstring(ex->Message->Data()));
+			if (SUCCEEDED(StringCchPrintfA(exc_message, _countof(exc_message), "Error (0x%x): %s", ex->HResult, tmp.c_str())))
+				*error = exc_message;
+			else
+				*error = "Exception + error converting exception message.";
+			return 0;
+		}
+		catch (...)
+		{
+			*error = "Generic c++ exception.";
+			return 0;
+		}
 
 		if (FAILED (Windows::Foundation::Initialize (RO_INIT_SINGLETHREADED)))
+		{
+			*error = "Error initializing Windows::Foundation.";
 			return 0;
+		}
 
 		return 1;
 	}
-- 
cgit 1.4.1