Index: src/chext/chext.cpp
===================================================================
diff -u -N -r8068e0c351055554340ac9755d1bc846893bf2b8 -rebc7fabbd2d59f9a0f723ea480b5374cc393ec12
--- src/chext/chext.cpp	(.../chext.cpp)	(revision 8068e0c351055554340ac9755d1bc846893bf2b8)
+++ src/chext/chext.cpp	(.../chext.cpp)	(revision ebc7fabbd2d59f9a0f723ea480b5374cc393ec12)
@@ -24,23 +24,16 @@
 #include "resource.h"
 #include "chext.h"
 #include "dllmain.h"
-#include "TLogger.h"
+#include "Logger.h"
 #include "GuidFormatter.h"
 
 /////////////////////////////////////////////////////////////////////////////
 // Used to determine whether the DLL can be unloaded by OLE
 
 STDAPI DllCanUnloadNow()
 {
-	BOOST_LOG_FUNC();
-
-	TLogger& rLogger = Logger::get();
-	BOOST_LOG_SEV(rLogger, debug) << L"";
-
 	HRESULT hResult = _AtlModule.DllCanUnloadNow();
 
-	BOOST_LOG_HRESULT(rLogger, hResult) << L"";
-
 	return hResult;
 }
 
@@ -49,15 +42,8 @@
 
 STDAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID* ppv)
 {
-	BOOST_LOG_FUNC();
-
-	TLogger& rLogger = Logger::get();
-	BOOST_LOG_SEV(rLogger, debug) << L"";
-
 	HRESULT hResult = _AtlModule.DllGetClassObject(rclsid, riid, ppv);
 
-	BOOST_LOG_HRESULT(rLogger, hResult) << L"clsid=" << GuidFormatter::FormatGuid(rclsid) << ", riid=" << GuidFormatter::FormatGuid(riid) << ", ppv=" << ppv;
-
 	return hResult;
 }
 
@@ -66,16 +52,9 @@
 
 STDAPI DllRegisterServer()
 {
-	BOOST_LOG_FUNC();
-
-	TLogger& rLogger = Logger::get();
-	BOOST_LOG_SEV(rLogger, debug) << L"";
-
 	// registers object, typelib and all interfaces in typelib
 	HRESULT hResult = _AtlModule.DllRegisterServer();
 
-	BOOST_LOG_HRESULT(rLogger, hResult) << L"";
-
 	return hResult;
 }
 
@@ -84,28 +63,15 @@
 
 STDAPI DllUnregisterServer()
 {
-	BOOST_LOG_FUNC();
-
-	TLogger& rLogger = Logger::get();
-	BOOST_LOG_SEV(rLogger, debug) << L"";
-
 	HRESULT hResult = _AtlModule.DllUnregisterServer();
 
-	BOOST_LOG_HRESULT(rLogger, hResult) << L"";
-
 	return hResult;
 }
 
 // DllInstall - Adds/Removes entries to the system registry per user
 //              per machine.	
 STDAPI DllInstall(BOOL bInstall, LPCWSTR pszCmdLine)
 {
-	BOOST_LOG_FUNC();
-
-	TLogger& rLogger = Logger::get();
-	BOOST_LOG_SEV(rLogger, debug) << L"";
-
-	HRESULT hr = E_FAIL;
 	static const wchar_t szUserSwitch[] = _T("user");
 
 	if (pszCmdLine != nullptr)
@@ -114,23 +80,15 @@
 			AtlSetPerUserRegistration(true);
 	}
 
+	HRESULT hResult = E_FAIL;
 	if (bInstall)
 	{
-		hr = DllRegisterServer();
-		if (FAILED(hr))
+		hResult = DllRegisterServer();
+		if (FAILED(hResult))
 			DllUnregisterServer();
 	}
 	else
-		hr = DllUnregisterServer();
+		hResult = DllUnregisterServer();
 
-	if(pszCmdLine)
-	{
-		BOOST_LOG_HRESULT(rLogger, hr) << LOG_PARAMS2(bInstall, pszCmdLine);
-	}
-	else
-	{
-		BOOST_LOG_HRESULT(rLogger, hr) << LOG_PARAM(bInstall);
-	}
-
-	return hr;
+	return hResult;
 }