Index: src/ch/StringHelpers.cpp
===================================================================
diff -u -raa6bff57279b9f9cfc276e9adab2763e2900878d -r4fe995b304ea342b50293f92d3c1992b43b820f7
--- src/ch/StringHelpers.cpp	(.../StringHelpers.cpp)	(revision aa6bff57279b9f9cfc276e9adab2763e2900878d)
+++ src/ch/StringHelpers.cpp	(.../StringHelpers.cpp)	(revision 4fe995b304ea342b50293f92d3c1992b43b820f7)
@@ -1,76 +1,60 @@
-/***************************************************************************
-*   Copyright (C) 2001-2008 by J�zef Starosczyk                           *
-*   ixen@copyhandler.com                                                  *
-*                                                                         *
-*   This program is free software; you can redistribute it and/or modify  *
-*   it under the terms of the GNU Library General Public License          *
-*   (version 2) as published by the Free Software Foundation;             *
-*                                                                         *
-*   This program is distributed in the hope that it will be useful,       *
-*   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
-*   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
-*   GNU General Public License for more details.                          *
-*                                                                         *
-*   You should have received a copy of the GNU Library General Public     *
-*   License along with this program; if not, write to the                 *
-*   Free Software Foundation, Inc.,                                       *
-*   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
-***************************************************************************/
+// ============================================================================
+//  Copyright (C) 2001-2015 by Jozef Starosczyk
+//  ixen@copyhandler.com
+//
+//  This program is free software; you can redistribute it and/or modify
+//  it under the terms of the GNU Library General Public License
+//  (version 2) as published by the Free Software Foundation;
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU Library General Public
+//  License along with this program; if not, write to the
+//  Free Software Foundation, Inc.,
+//  59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+// ============================================================================
 #include "stdafx.h"
 #include "ch.h"
 #include "StringHelpers.h"
 #include "stdio.h"
+#include "resource.h"
 
 #ifdef _DEBUG
 #define new DEBUG_NEW
 #endif
 
-#ifdef _MFC_VER
-void ExpandFormatString(CString* pstrFmt, DWORD dwError)
+CString GetSizeString(double dData)
 {
-	// replace strings %errnum & %errdesc to something else
-	TCHAR xx[_MAX_PATH];
-	pstrFmt->Replace(_T("%errnum"), _itot(dwError, xx, 10));
-	
-	FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM, NULL, dwError, 0, xx, _MAX_PATH, NULL);
-
-	while (xx[_tcslen(xx)-1] == _T('\n') || xx[_tcslen(xx)-1] == _T('\r'))
-		xx[_tcslen(xx)-1] = _T('\0');
-
-	pstrFmt->Replace(_T("%errdesc"), xx);
-}
-#endif
-
-LPTSTR GetSizeString(double dData, LPTSTR pszBuffer, size_t stMaxBufferSize)
-{
 	if (dData < 0.0)
-		dData=0.0;
+		dData = 0.0;
 
+	CString strResult;
 	if (dData < 1200.0)
-		_sntprintf(pszBuffer, stMaxBufferSize, _T("%.2f %s"), dData, GetResManager().LoadString(IDS_BYTE_STRING));
+		strResult.Format(_T("%.2f %s"), dData, GetResManager().LoadString(IDS_BYTE_STRING));
 	else if (dData < 1228800.0)
-		_sntprintf(pszBuffer, stMaxBufferSize, _T("%.2f %s"), static_cast<double>(dData)/1024.0, GetResManager().LoadString(IDS_KBYTE_STRING));
+		strResult.Format(_T("%.2f %s"), static_cast<double>(dData) / 1024.0, GetResManager().LoadString(IDS_KBYTE_STRING));
 	else if (dData < 1258291200.0)
-		_sntprintf(pszBuffer, stMaxBufferSize, _T("%.2f %s"), static_cast<double>(dData)/1048576.0, GetResManager().LoadString(IDS_MBYTE_STRING));
+		strResult.Format(_T("%.2f %s"), static_cast<double>(dData) / 1048576.0, GetResManager().LoadString(IDS_MBYTE_STRING));
 	else
-		_sntprintf(pszBuffer, stMaxBufferSize, _T("%.2f %s"), static_cast<double>(dData)/1073741824.0, GetResManager().LoadString(IDS_GBYTE_STRING));
+		strResult.Format(_T("%.2f %s"), static_cast<double>(dData) / 1073741824.0, GetResManager().LoadString(IDS_GBYTE_STRING));
 
-	return pszBuffer;
+	return strResult;
 }
 
-LPTSTR GetSizeString(ull_t ullData, LPTSTR pszBuffer, size_t stMaxBufferSize, bool bStrict)
+CString GetSizeString(unsigned long long ullData, bool bStrict)
 {
-	if (ullData < 0)
-		ullData=0;
-
+	CString strResult;
 	if (ullData >= 1258291200 && (!bStrict || (ullData % 1073741824) == 0))
-		_sntprintf(pszBuffer, stMaxBufferSize, _T("%.2f %s"), (double)(ullData/1073741824.0), GetResManager().LoadString(IDS_GBYTE_STRING));
+		strResult.Format(_T("%.2f %s"), (double)(ullData / 1073741824.0), GetResManager().LoadString(IDS_GBYTE_STRING));
 	else if (ullData >= 1228800 && (!bStrict || (ullData % 1048576) == 0))
-		_sntprintf(pszBuffer, stMaxBufferSize, _T("%.2f %s"), (double)(ullData/1048576.0), GetResManager().LoadString(IDS_MBYTE_STRING));
+		strResult.Format(_T("%.2f %s"), (double)(ullData / 1048576.0), GetResManager().LoadString(IDS_MBYTE_STRING));
 	else if (ullData >= 1200 && (!bStrict || (ullData % 1024) == 0))
-		_sntprintf(pszBuffer, stMaxBufferSize, _T("%.2f %s"), (double)(ullData/1024.0), GetResManager().LoadString(IDS_KBYTE_STRING));
+		strResult.Format(_T("%.2f %s"), (double)(ullData / 1024.0), GetResManager().LoadString(IDS_KBYTE_STRING));
 	else
-		_sntprintf(pszBuffer, stMaxBufferSize, _T("%I64u %s"), ullData, GetResManager().LoadString(IDS_BYTE_STRING));
+		strResult.Format(_T("%I64u %s"), ullData, GetResManager().LoadString(IDS_BYTE_STRING));
 
-	return pszBuffer;
+	return strResult;
 }