Index: src/chext/TShellExtData.cpp
===================================================================
diff -u -N -r4fe995b304ea342b50293f92d3c1992b43b820f7 -r8068e0c351055554340ac9755d1bc846893bf2b8
--- src/chext/TShellExtData.cpp	(.../TShellExtData.cpp)	(revision 4fe995b304ea342b50293f92d3c1992b43b820f7)
+++ src/chext/TShellExtData.cpp	(.../TShellExtData.cpp)	(revision 8068e0c351055554340ac9755d1bc846893bf2b8)
@@ -70,7 +70,7 @@
 		ReadKeyboardState();
 
 		// experimentally deduced condition
-		m_bFolderBackground = (piDataObject == NULL) && (pidlFolder != NULL);
+		m_bFolderBackground = (piDataObject == nullptr) && (pidlFolder != nullptr);
 	}
 
 	return hResult;
@@ -467,7 +467,7 @@
 	if(!uiPreferredDropEffect)
 		return E_FAIL;
 
-	FORMATETC fe = { (CLIPFORMAT)uiPreferredDropEffect, NULL, DVASPECT_CONTENT, -1, TYMED_HGLOBAL};
+	FORMATETC fe = { (CLIPFORMAT)uiPreferredDropEffect, nullptr, DVASPECT_CONTENT, -1, TYMED_HGLOBAL};
 
 	// if the drop effect does not exist - just report it
 	m_dwIDataObjectDropEffect = 0;
@@ -504,7 +504,7 @@
 	if(IsClipboardFormatAvailable(CF_HDROP))
 	{
 		// read paths from clipboard
-		if(!OpenClipboard(NULL))
+		if(!OpenClipboard(nullptr))
 			return E_FAIL;
 
 		HANDLE hClipboardData = GetClipboardData(CF_HDROP);
@@ -555,7 +555,7 @@
 	// it's none by default
 	m_eDefaultSystemMenuAction = eAction_None;
 
-	BOOST_ASSERT(hMenu != NULL);
+	BOOST_ASSERT(hMenu != nullptr);
 	if(hMenu)
 	{
 		MENUITEMINFO mii;