Index: src/chext/MenuExt.cpp
===================================================================
diff -u -N -r8068e0c351055554340ac9755d1bc846893bf2b8 -rebc7fabbd2d59f9a0f723ea480b5374cc393ec12
--- src/chext/MenuExt.cpp	(.../MenuExt.cpp)	(revision 8068e0c351055554340ac9755d1bc846893bf2b8)
+++ src/chext/MenuExt.cpp	(.../MenuExt.cpp)	(revision ebc7fabbd2d59f9a0f723ea480b5374cc393ec12)
@@ -29,7 +29,7 @@
 #include "../libchcore/TTaskDefinition.h"
 #include <boost/numeric/conversion/cast.hpp>
 #include "ShellExtensionVerifier.h"
-#include "TLogger.h"
+#include "Logger.h"
 
 // globals
 static void CutAmpersands(LPTSTR lpszString)
@@ -50,13 +50,11 @@
 /////////////////////////////////////////////////////////////////////////////
 // CMenuExt
 CMenuExt::CMenuExt() :
-	m_piShellExtControl(nullptr)
+	m_piShellExtControl(nullptr),
+	m_spLog(GetLogger(L"CMenuExt"))
 {
-	BOOST_LOG_FUNC();
-
 	HRESULT hResult = CoCreateInstance(CLSID_CShellExtControl, nullptr, CLSCTX_ALL, IID_IShellExtControl, (void**)&m_piShellExtControl);
-	TLogger& rLogger = Logger::get();
-	BOOST_LOG_HRESULT(rLogger, hResult) << LOG_PARAM(m_piShellExtControl);
+	LOG_HRESULT(m_spLog, hResult) << L"Creation of ShellExtControl " << LOG_PARAM(m_piShellExtControl);
 }
 
 CMenuExt::~CMenuExt()
@@ -70,14 +68,11 @@
 
 STDMETHODIMP CMenuExt::Initialize(LPCITEMIDLIST pidlFolder, IDataObject* piDataObject, HKEY /*hkeyProgID*/)
 {
-	BOOST_LOG_FUNC();
+	LOG_DEBUG(m_spLog) << L"Initializing";
 
-	TLogger& rLogger = Logger::get();
-	BOOST_LOG_SEV(rLogger, debug) << L"";
-
 	if(!pidlFolder && !piDataObject)
 	{
-		BOOST_LOG_SEV(rLogger, error) << L"Missing both pointers.";
+		LOG_ERROR(m_spLog) << L"Missing both pointers.";
 		return E_INVALIDARG;
 	}
 
@@ -87,21 +82,21 @@
 		return S_OK;
 
 	HRESULT hResult = ReadShellConfig();
+	LOG_HRESULT(m_spLog, hResult) << L"Read shell config";
+
 	if(SUCCEEDED(hResult))
+	{
 		hResult = m_tShellExtData.GatherDataFromInitialize(pidlFolder, piDataObject);
+		LOG_HRESULT(m_spLog, hResult) << L"Gather data from initialize";
+	}
 
-	BOOST_LOG_HRESULT(rLogger, hResult) << L"";
-
 	return hResult;
 }
 
 STDMETHODIMP CMenuExt::QueryContextMenu(HMENU hMenu, UINT indexMenu, UINT idCmdFirst, UINT /*idCmdLast*/, UINT /*uFlags*/)
 {
-	BOOST_LOG_FUNC();
+	LOG_DEBUG(m_spLog) << L"Querying context menu";
 
-	TLogger& rLogger = Logger::get();
-	BOOST_LOG_SEV(rLogger, debug) << L"";
-
 	// check options
 	HWND hWnd = ShellExtensionVerifier::VerifyShellExt(m_piShellExtControl);
 	if(!hWnd)
@@ -156,11 +151,8 @@
 
 STDMETHODIMP CMenuExt::InvokeCommand(LPCMINVOKECOMMANDINFO lpici)
 {
-	BOOST_LOG_FUNC();
+	LOG_DEBUG(m_spLog) << L"Invoking command";
 
-	TLogger& rLogger = Logger::get();
-	BOOST_LOG_SEV(rLogger, debug) << L"";
-
 	// textual verbs are not supported by this extension
 	if(HIWORD(lpici->lpVerb) != 0)
 		return E_FAIL;
@@ -218,11 +210,8 @@
 
 HRESULT CMenuExt::HandleMenuMsg2(UINT uMsg, WPARAM /*wParam*/, LPARAM lParam, LRESULT* /*plResult*/)
 {
-	BOOST_LOG_FUNC();
+	LOG_DEBUG(m_spLog) << L"Handle menu message (2)";
 
-	TLogger& rLogger = Logger::get();
-	BOOST_LOG_SEV(rLogger, debug) << L"";
-
 	switch(uMsg)
 	{
 	case WM_INITMENUPOPUP:
@@ -279,14 +268,11 @@
 
 HRESULT CMenuExt::DrawMenuItem(LPDRAWITEMSTRUCT lpdis)
 {
-	BOOST_LOG_FUNC();
+	LOG_DEBUG(m_spLog) << L"Drawing menu item";
 
-	TLogger& rLogger = Logger::get();
-	BOOST_LOG_SEV(rLogger, debug) << L"";
-
 	if(!lpdis)
 	{
-		BOOST_LOG_SEV(rLogger, error) << L"Missing argument";
+		LOG_ERROR(m_spLog) << L"Missing argument";
 		return E_FAIL;
 	}
 
@@ -346,11 +332,8 @@
 
 STDMETHODIMP CMenuExt::GetCommandString(UINT_PTR idCmd, UINT uFlags, UINT* /*pwReserved*/, LPSTR pszName, UINT cchMax)
 {
-	BOOST_LOG_FUNC();
+	LOG_DEBUG(m_spLog) << L"Retrieving command string for cmd " << idCmd;
 
-	TLogger& rLogger = Logger::get();
-	BOOST_LOG_SEV(rLogger, debug) << L"";
-
 	memset(pszName, 0, cchMax);
 
 	if(uFlags != GCS_HELPTEXTW && uFlags != GCS_HELPTEXTA)
@@ -388,10 +371,6 @@
 
 HRESULT CMenuExt::ReadShellConfig()
 {
-	BOOST_LOG_FUNC();
-
-	TLogger& rLogger = Logger::get();
-
 	try
 	{
 		HWND hWnd = ShellExtensionVerifier::VerifyShellExt(m_piShellExtControl);
@@ -402,7 +381,7 @@
 		unsigned long ulSHMID = GetTickCount();
 		if(::SendMessage(hWnd, WM_GETCONFIG, eLocation_ContextMenu, ulSHMID) != TRUE)
 		{
-			BOOST_LOG_SEV(rLogger, error) << L"Failed to retrieve configuration from Copy Handler";
+			LOG_ERROR(m_spLog) << L"Failed to retrieve configuration from Copy Handler";
 			return E_FAIL;
 		}