Index: src/chext/MenuExt.cpp
===================================================================
diff -u -N -rb54c79b15d7c1a101c43994e9a403b07d695c8dc -r8068e0c351055554340ac9755d1bc846893bf2b8
--- src/chext/MenuExt.cpp	(.../MenuExt.cpp)	(revision b54c79b15d7c1a101c43994e9a403b07d695c8dc)
+++ src/chext/MenuExt.cpp	(.../MenuExt.cpp)	(revision 8068e0c351055554340ac9755d1bc846893bf2b8)
@@ -50,11 +50,11 @@
 /////////////////////////////////////////////////////////////////////////////
 // CMenuExt
 CMenuExt::CMenuExt() :
-	m_piShellExtControl(NULL)
+	m_piShellExtControl(nullptr)
 {
 	BOOST_LOG_FUNC();
 
-	HRESULT hResult = CoCreateInstance(CLSID_CShellExtControl, NULL, CLSCTX_ALL, IID_IShellExtControl, (void**)&m_piShellExtControl);
+	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);
 }
@@ -64,7 +64,7 @@
 	if(m_piShellExtControl)
 	{
 		m_piShellExtControl->Release();
-		m_piShellExtControl = NULL;
+		m_piShellExtControl = nullptr;
 	}
 }
 
@@ -127,9 +127,9 @@
 		_tcslwr(szText);
 
 		// check for texts Wytnij/Wklej/Kopiuj/Cut/Paste/Copy
-		if (_tcsstr(szText, _T("wytnij")) != NULL || _tcsstr(szText, _T("wklej")) != NULL ||
-			_tcsstr(szText, _T("kopiuj")) != NULL || _tcsstr(szText, _T("cut")) != NULL ||
-			_tcsstr(szText, _T("paste")) != NULL || _tcsstr(szText, _T("copy")) != NULL)
+		if (_tcsstr(szText, _T("wytnij")) != nullptr || _tcsstr(szText, _T("wklej")) != nullptr ||
+			_tcsstr(szText, _T("kopiuj")) != nullptr || _tcsstr(szText, _T("cut")) != nullptr ||
+			_tcsstr(szText, _T("paste")) != nullptr || _tcsstr(szText, _T("copy")) != nullptr)
 		{
 			// found - find the nearest bar and insert above
 			for (int j=i+1;j<iCount;j++)
@@ -167,7 +167,7 @@
 
 	// check options
 	HWND hWnd = ShellExtensionVerifier::VerifyShellExt(m_piShellExtControl);
-	if(hWnd == NULL)
+	if(hWnd == nullptr)
 		return E_FAIL;
 
 	// find command to be executed, if not found - fail
@@ -213,7 +213,7 @@
 
 HRESULT CMenuExt::HandleMenuMsg(UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
-	return HandleMenuMsg2(uMsg, wParam, lParam, NULL);
+	return HandleMenuMsg2(uMsg, wParam, lParam, nullptr);
 }
 
 HRESULT CMenuExt::HandleMenuMsg2(UINT uMsg, WPARAM /*wParam*/, LPARAM lParam, LRESULT* /*plResult*/)
@@ -306,7 +306,7 @@
 	const int iRightMargin = GetSystemMetrics(SM_CXMENUCHECK) - iLeftMargin;
 	
 	// text color
-	HBRUSH hBrush = NULL;
+	HBRUSH hBrush = nullptr;
 	if(lpdis->itemState & ODS_SELECTED)
 	{
 		SetTextColor(lpdis->hDC, GetSysColor(COLOR_HIGHLIGHTTEXT));
@@ -395,7 +395,7 @@
 	try
 	{
 		HWND hWnd = ShellExtensionVerifier::VerifyShellExt(m_piShellExtControl);
-		if(hWnd == NULL)
+		if(hWnd == nullptr)
 			return E_FAIL;
 
 		// get cfg from ch