Add SetLogCallback() and GetLogCallback() functions

Author: sdottaka

src/WinWebDiffLib/WebDiffWindow.hpp

@@ -84,7 +84,7 @@ class CWebDiffWindow : public IWebDiffWindow
 			{
 				std::wstring userDataFolder = GetUserDataFolderPath(i);
 				ComPtr<IWebDiffCallback> callback2(callback);
-				hr = m_webWindow[i].Create(m_hInstance, m_hWnd, urls[i], userDataFolder.c_str(),
+				hr = m_webWindow[i].Create(this, m_hInstance, m_hWnd, urls[i], userDataFolder.c_str(),
 						m_size, m_fitToWindow, m_zoom, m_userAgent, nullptr,
 						[this, i, callback2](WebDiffEvent::EVENT_TYPE event, IUnknown* sender, IUnknown* args)
 							{
@@ -580,6 +580,16 @@ class CWebDiffWindow : public IWebDiffWindow
 		}
 	}
 
+	LogCallback GetLogCallback() const
+	{
+		return m_logCallback;
+	}
+
+	void SetLogCallback(LogCallback logCallback)
+	{
+		m_logCallback = logCallback;
+	}
+
 	int  GetDiffCount() const override
 	{
 		return static_cast<int>(m_diffInfos.size());
@@ -1543,4 +1553,5 @@ class CWebDiffWindow : public IWebDiffWindow
 		RGB(241, 226, 173), RGB(255, 170, 130), RGB(0, 0, 0),
 		RGB(255, 160, 160), RGB(200, 129, 108), RGB(0, 0, 0),
 	};
+	LogCallback m_logCallback;
 };

src/WinWebDiffLib/WebWindow.hpp

@@ -56,7 +56,7 @@ class CWebWindow
 				[this, url2, zoom, userAgent, args, deferral, callback2](HRESULT result, ICoreWebView2Controller* controller) -> HRESULT {
 					if (FAILED(result))
 					{
-						m_parent->SetToolTipText(L"Failed to create WebView2 controller");
+						m_parent->SetErrorToolTipText(L"Failed to create WebView2 controller");
 						m_parent->ShowToolTip(true);
 					}
 
@@ -267,10 +267,11 @@ class CWebWindow
 		return m_hWnd;
 	}
 
-	HRESULT Create(HINSTANCE hInstance, HWND hWndParent, const wchar_t* url, const wchar_t* userDataFolder,
+	HRESULT Create(IWebDiffWindow* pDiffWindow, HINSTANCE hInstance, HWND hWndParent, const wchar_t* url, const wchar_t* userDataFolder,
 		const SIZE& size, bool fitToWindow, double zoom, std::wstring& userAgent,
 		IWebDiffCallback* callback, std::function<void(WebDiffEvent::EVENT_TYPE, IUnknown*, IUnknown*)> eventHandler)
 	{
+		m_pDiffWindow = pDiffWindow;
 		m_fitToWindow = fitToWindow;
 		m_size = size;
 		m_eventHandler = eventHandler;
@@ -1049,7 +1050,7 @@ class CWebWindow
 				[this, callback2, msg](HRESULT errorCode, LPCWSTR returnObjectAsJson) -> HRESULT {
 					if (FAILED(errorCode))
 					{
-						SetToolTipText(*msg + returnObjectAsJson);
+						SetErrorToolTipText(*msg + returnObjectAsJson);
 						ShowToolTip(true, TOOLTIP_TIMEOUT);
 					}
 					if (callback2)
@@ -1069,7 +1070,7 @@ class CWebWindow
 				[this, callback2](HRESULT errorCode, LPCWSTR resultObjectAsJson) -> HRESULT {
 					if (FAILED(errorCode))
 					{
-						SetToolTipText(resultObjectAsJson);
+						SetErrorToolTipText(resultObjectAsJson);
 						ShowToolTip(true, TOOLTIP_TIMEOUT);
 					}
 					if (callback2)
@@ -1092,7 +1093,7 @@ class CWebWindow
 					[this, callback2](HRESULT errorCode, LPCWSTR resultObjectAsJson) -> HRESULT {
 						if (FAILED(errorCode))
 						{
-							SetToolTipText(resultObjectAsJson);
+							SetErrorToolTipText(resultObjectAsJson);
 							ShowToolTip(true, TOOLTIP_TIMEOUT);
 						}
 						if (callback2)
@@ -1107,7 +1108,7 @@ class CWebWindow
 					[this, callback2](HRESULT errorCode, LPCWSTR resultObjectAsJson) -> HRESULT {
 						if (FAILED(errorCode))
 						{
-							SetToolTipText(resultObjectAsJson);
+							SetErrorToolTipText(resultObjectAsJson);
 							ShowToolTip(true, TOOLTIP_TIMEOUT);
 						}
 						if (callback2)
@@ -1309,6 +1310,14 @@ class CWebWindow
 		return webView2Profile2->ClearBrowsingData(static_cast<COREWEBVIEW2_BROWSING_DATA_KINDS>(dataKinds), nullptr);
 	}
 
+	HRESULT SetErrorToolTipText(const std::wstring& text)
+	{
+		IWebDiffWindow::LogCallback logCallback = m_pDiffWindow->GetLogCallback();
+		if (logCallback)
+			logCallback(IWebDiffWindow::LogLevel::ERR, text.c_str());
+		return SetToolTipText(text);
+	}
+
 	HRESULT SetToolTipText(const std::wstring& text)
 	{
 		if (!m_hToolTip)
@@ -2089,5 +2098,6 @@ class CWebWindow
 		return reinterpret_cast<decltype(&::GetDpiForWindow)>(
 			::GetProcAddress(hUser32, "GetDpiForWindow"));
 	}();
+	IWebDiffWindow* m_pDiffWindow = nullptr;
 };
 

src/WinWebDiffLib/WinWebDiffLib.h

@@ -69,6 +69,8 @@ struct IWebDiffWindow
 		COMPARING,
 		COMPARED,
 	};
+	enum class LogLevel : int { ERR, WARN, INFO };
+
 	struct DiffOptions
 	{
 		enum DiffAlgorithm {
@@ -115,6 +117,7 @@ struct IWebDiffWindow
 		COLORREF	clrSelWordDiffDeleted;	/**< Selected word difference deleted color */
 		COLORREF	clrSelWordDiffText;	/**< Selected word difference text color */
 	};
+	using LogCallback = void(*)(LogLevel level, const wchar_t *msg);
 
 	virtual bool IsWebView2Installed() const = 0;
 	virtual bool DownloadWebView2() const = 0;
@@ -193,6 +196,8 @@ struct IWebDiffWindow
 	virtual void SetSyncEventFlag(EventType event, bool flag) = 0;
 	virtual CompareState GetCompareState() const = 0;
 	virtual void RaiseEvent(const WebDiffEvent& e) = 0;
+	virtual LogCallback GetLogCallback() const = 0;
+	virtual void SetLogCallback(LogCallback logCallback) = 0;
 };
 
 struct IWebToolWindow