Integrate C++11 branch into 5_1-new

src/archutils/Win32/GotoURL.cpp

@@ -25,7 +25,7 @@ static LONG GetRegKey( HKEY key, RString subkey, LPTSTR retdata )
 bool GotoURL( RString sUrl )
 {
 	// First try ShellExecute()
-	int iRet = (int) ShellExecute( NULL, "open", sUrl, NULL, NULL, SW_SHOWDEFAULT );
+	int iRet = (int) ShellExecute( nullptr, "open", sUrl, nullptr, nullptr, SW_SHOWDEFAULT );
 
 	// If it failed, get the .htm regkey and lookup the program
 	if( iRet > 32 )
@@ -41,11 +41,11 @@ bool GotoURL( RString sUrl )
 		return false;
 
 	char *szPos = strstr( key, "\"%1\"" );
-	if( szPos == NULL )
+	if( szPos == nullptr )
 	{
 		// No quotes found. Check for %1 without quotes
 		szPos = strstr( key, "%1" );
-		if( szPos == NULL )
+		if( szPos == nullptr )
 			szPos = key+lstrlen(key)-1;	// No parameter.
 		else
 			*szPos = '\0';	// Remove the parameter