Index: src/ch/CustomCopyDlg.cpp
===================================================================
diff -u -r926b1177cffa2face218fabb3d8af71910d1b8e5 -r8068e0c351055554340ac9755d1bc846893bf2b8
--- src/ch/CustomCopyDlg.cpp	(.../CustomCopyDlg.cpp)	(revision 926b1177cffa2face218fabb3d8af71910d1b8e5)
+++ src/ch/CustomCopyDlg.cpp	(.../CustomCopyDlg.cpp)	(revision 8068e0c351055554340ac9755d1bc846893bf2b8)
@@ -28,6 +28,7 @@
 #include "StringHelpers.h"
 #include "ch.h"
 #include "../libchcore/TTaskConfigBufferSizes.h"
+#include "CfgProperties.h"
 
 #ifdef _DEBUG
 #define new DEBUG_NEW
@@ -40,13 +41,13 @@
 
 
 CCustomCopyDlg::CCustomCopyDlg() :
-	ictranslate::CLanguageDialog(CCustomCopyDlg::IDD)
+	ictranslate::CLanguageDialog(IDD_CUSTOM_COPY_DIALOG)
 {
 	GetConfig().ExtractSubConfig(BRANCH_TASK_SETTINGS, m_tTaskDefinition.GetConfiguration());
 }
 
 CCustomCopyDlg::CCustomCopyDlg(const chcore::TTaskDefinition& rTaskDefinition) :
-	ictranslate::CLanguageDialog(CCustomCopyDlg::IDD),
+	ictranslate::CLanguageDialog(IDD_CUSTOM_COPY_DIALOG),
 	m_tTaskDefinition(rTaskDefinition)
 {
 }
@@ -383,7 +384,7 @@
 
 void CCustomCopyDlg::OnAddFilesButton() 
 {
-	CFileDialog dlg(TRUE, NULL, NULL, OFN_ALLOWMULTISELECT | OFN_ENABLESIZING | OFN_EXPLORER | OFN_FILEMUSTEXIST | OFN_NODEREFERENCELINKS | OFN_HIDEREADONLY | OFN_OVERWRITEPROMPT, GetResManager().LoadString(IDS_FILEDLGALLFILTER_STRING), this);
+	CFileDialog dlg(TRUE, nullptr, nullptr, OFN_ALLOWMULTISELECT | OFN_ENABLESIZING | OFN_EXPLORER | OFN_FILEMUSTEXIST | OFN_NODEREFERENCELINKS | OFN_HIDEREADONLY | OFN_OVERWRITEPROMPT, GetResManager().LoadString(IDS_FILEDLGALLFILTER_STRING), this);
 	
 	TCHAR *pszBuffer = new TCHAR[65535];
 	memset(pszBuffer, 0, 65535*sizeof(TCHAR));
@@ -424,7 +425,7 @@
 	while (true)
 	{
 		pos = m_ctlFiles.GetFirstSelectedItemPosition();
-		if (pos == NULL)
+		if (pos == nullptr)
 			break;
 		else
 		{
@@ -564,7 +565,7 @@
 void CCustomCopyDlg::AddFilter(const chcore::TFileFilter &rFilter, int iPos)
 {
 	LVITEM lvi;
-	TCHAR szLoaded[1024];
+	CString strLoaded;
 
 	lvi.mask=LVIF_TEXT;
 	lvi.iItem=(iPos == -1) ? m_ctlFilters.GetItemCount() : iPos;
@@ -575,27 +576,27 @@
 	if (rFilter.GetUseMask())
 	{
 		chcore::TString strData = rFilter.GetCombinedMask();
-		_tcscpy(szLoaded, strData.c_str());
+		strLoaded = strData.c_str();
 	}
 	else
-		_tcscpy(szLoaded, GetResManager().LoadString(IDS_FILTERMASKEMPTY_STRING));
+		strLoaded = GetResManager().LoadString(IDS_FILTERMASKEMPTY_STRING);
 	
-	lvi.pszText=szLoaded;
+	lvi.pszText = (PTSTR)(PCTSTR)strLoaded;
 	lvi.cchTextMax=lstrlen(lvi.pszText);
 	m_ctlFilters.InsertItem(&lvi);
 
 	/////////////////////
 	lvi.iSubItem=1;
 	
-	if (rFilter.GetUseExcludeMask())
+	if(rFilter.GetUseExcludeMask())
 	{
 		chcore::TString strData = rFilter.GetCombinedExcludeMask();
-		_tcscpy(szLoaded, strData.c_str());
+		strLoaded = strData.c_str();
 	}
 	else
-		_tcscpy(szLoaded, GetResManager().LoadString(IDS_FILTERMASKEMPTY_STRING));
+		strLoaded = GetResManager().LoadString(IDS_FILTERMASKEMPTY_STRING);
 	
-	lvi.pszText=szLoaded;
+	lvi.pszText = (PTSTR)(PCTSTR)strLoaded;
 	lvi.cchTextMax=lstrlen(lvi.pszText);
 	m_ctlFilters.SetItem(&lvi);
 
@@ -604,20 +605,17 @@
 	
 	if (rFilter.GetUseSize1())
 	{
-		_sntprintf(szLoaded, 1024, _T("%s %s"), GetResManager().LoadString(IDS_LT_STRING+rFilter.GetSizeType1()), GetSizeString(rFilter.GetSize1(), true));
-		szLoaded[1023] = _T('\0');
+		strLoaded.Format(_T("%s %s"), GetResManager().LoadString(IDS_LT_STRING+rFilter.GetSizeType1()), (PCTSTR)GetSizeString(rFilter.GetSize1(), true));
 		if (rFilter.GetUseSize2())
 		{
-			_tcscat(szLoaded, GetResManager().LoadString(IDS_AND_STRING));
-			CString strLoaded2;
-			strLoaded2.Format(_T("%s %s"), GetResManager().LoadString(IDS_LT_STRING+rFilter.GetSizeType2()), GetSizeString(rFilter.GetSize2(), true));
-			_tcscat(szLoaded, strLoaded2);
+			strLoaded += GetResManager().LoadString(IDS_AND_STRING);
+			strLoaded.AppendFormat(_T("%s %s"), GetResManager().LoadString(IDS_LT_STRING+rFilter.GetSizeType2()), (PCTSTR)GetSizeString(rFilter.GetSize2(), true));
 		}
 	}
 	else
-		_tcscpy(szLoaded, GetResManager().LoadString(IDS_FILTERSIZE_STRING));
+		strLoaded = GetResManager().LoadString(IDS_FILTERSIZE_STRING);
 	
-	lvi.pszText=szLoaded;
+	lvi.pszText = (PTSTR)(PCTSTR)strLoaded;
 	lvi.cchTextMax=lstrlen(lvi.pszText);
 	m_ctlFilters.SetItem(&lvi);
 
@@ -626,72 +624,72 @@
 	
 	if (rFilter.GetUseDateTime1())
 	{
-		_sntprintf(szLoaded, 1024, _T("%s %s"), GetResManager().LoadString(IDS_DATECREATED_STRING+rFilter.GetDateType()), GetResManager().LoadString(IDS_LT_STRING+rFilter.GetDateCmpType1()));
-		szLoaded[1023] = _T('\0');
+		strLoaded.Format(_T("%s %s"), GetResManager().LoadString(IDS_DATECREATED_STRING+rFilter.GetDateType()), GetResManager().LoadString(IDS_LT_STRING+rFilter.GetDateCmpType1()));
+
 		chcore::TString strFmtDateTime = rFilter.GetDateTime1().Format(rFilter.GetUseDate1(), rFilter.GetUseTime1());
-		_tcscat(szLoaded, strFmtDateTime.c_str());
+		strLoaded += strFmtDateTime.c_str();
 
 		if (rFilter.GetUseDateTime2())
 		{
-			_tcscat(szLoaded, GetResManager().LoadString(IDS_AND_STRING));
-			_tcscat(szLoaded, GetResManager().LoadString(IDS_LT_STRING + rFilter.GetDateCmpType2()));
+			strLoaded += GetResManager().LoadString(IDS_AND_STRING);
+			strLoaded += GetResManager().LoadString(IDS_LT_STRING + rFilter.GetDateCmpType2());
 
 			strFmtDateTime = rFilter.GetDateTime2().Format(rFilter.GetUseDate2(), rFilter.GetUseTime2());
-			_tcscat(szLoaded, strFmtDateTime.c_str());
+			strLoaded += strFmtDateTime.c_str();
 		}
 	}
 	else
-		_tcscpy(szLoaded, GetResManager().LoadString(IDS_FILTERDATE_STRING));
+		strLoaded = GetResManager().LoadString(IDS_FILTERDATE_STRING);
 
-	lvi.pszText=szLoaded;
+	lvi.pszText = (PTSTR)(PCTSTR)strLoaded;
 	lvi.cchTextMax=lstrlen(lvi.pszText);
 	m_ctlFilters.SetItem(&lvi);
 
 	/////////////////////
 	lvi.iSubItem=4;
-	szLoaded[0]=_T('\0');
+	strLoaded.Empty();
 	if(rFilter.GetUseAttributes())
 	{
 		if(rFilter.GetArchive() == 1)
-			_tcscat(szLoaded, _T("A"));
+			strLoaded += L"A";
 		if(rFilter.GetReadOnly() == 1)
-			_tcscat(szLoaded, _T("R"));
+			strLoaded += _T("R");
 		if(rFilter.GetHidden() == 1)
-			_tcscat(szLoaded, _T("H"));
+			strLoaded += _T("H");
 		if(rFilter.GetSystem() == 1)
-			_tcscat(szLoaded, _T("S"));
+			strLoaded += _T("S");
 		if(rFilter.GetDirectory() == 1)
-			_tcscat(szLoaded, _T("D"));
+			strLoaded += _T("D");
 	}
 
-	if (!rFilter.GetUseAttributes() || szLoaded[0] == _T('\0'))
-		_tcscpy(szLoaded, GetResManager().LoadString(IDS_FILTERATTRIB_STRING));
+	if (!rFilter.GetUseAttributes() || strLoaded.IsEmpty())
+		strLoaded = GetResManager().LoadString(IDS_FILTERATTRIB_STRING);
 	
-	lvi.pszText=szLoaded;
+	lvi.pszText = (PTSTR)(PCTSTR)strLoaded;
 	lvi.cchTextMax=lstrlen(lvi.pszText);
 	m_ctlFilters.SetItem(&lvi);
 
 	/////////////////////
 	lvi.iSubItem=5;
-	szLoaded[0]=_T('\0');
+	strLoaded.Empty();
 	if(rFilter.GetUseAttributes())
 	{
 		if(rFilter.GetArchive() == 0)
-			_tcscat(szLoaded, _T("A"));
+			strLoaded += _T("A");
 		if(rFilter.GetReadOnly() == 0)
-			_tcscat(szLoaded, _T("R"));
+			strLoaded += _T("R");
 		if(rFilter.GetHidden() == 0)
-			_tcscat(szLoaded, _T("H"));
+			strLoaded += _T("H");
 		if(rFilter.GetSystem() == 0)
-			_tcscat(szLoaded, _T("S"));
+			strLoaded += _T("S");
 		if(rFilter.GetDirectory() == 0)
-			_tcscat(szLoaded, _T("D"));
+			strLoaded += _T("D");
 	}
 
-	if(!rFilter.GetUseAttributes() || szLoaded[0] == _T('0'))
-		_tcscpy(szLoaded, GetResManager().LoadString(IDS_FILTERATTRIB_STRING));
+	if(!rFilter.GetUseAttributes() || strLoaded.IsEmpty())
+		strLoaded = GetResManager().LoadString(IDS_FILTERATTRIB_STRING);
 
-	lvi.pszText=szLoaded;
+	lvi.pszText = (PTSTR)(PCTSTR)strLoaded;
 	lvi.cchTextMax=lstrlen(lvi.pszText);
 	m_ctlFilters.SetItem(&lvi);
 }
@@ -705,7 +703,7 @@
 	while(true)
 	{
 		pos=m_ctlFilters.GetFirstSelectedItemPosition();
-		if (pos == NULL)
+		if (pos == nullptr)
 			break;
 		else
 		{
@@ -718,7 +716,7 @@
 
 void CCustomCopyDlg::OnDestroy() 
 {
-	m_ctlFiles.SetImageList(NULL, LVSIL_SMALL);
+	m_ctlFiles.SetImageList(nullptr, LVSIL_SMALL);
 	m_ilImages.Detach();
 
 	CLanguageDialog::OnDestroy();
@@ -755,7 +753,7 @@
 void CCustomCopyDlg::OnDblclkFiltersList(NMHDR* /*pNMHDR*/, LRESULT* pResult) 
 {
 	POSITION pos = m_ctlFilters.GetFirstSelectedItemPosition();
-	if(pos != NULL)
+	if(pos != nullptr)
 	{
 		chcore::TFileFiltersArray& afFilters = m_tTaskDefinition.GetFilters();
 
@@ -866,7 +864,7 @@
 {
 	boost::shared_array<BYTE> spBuffer;
 
-	CFileDialog dlg(TRUE, NULL, NULL, OFN_HIDEREADONLY | OFN_OVERWRITEPROMPT, GetResManager().LoadString(IDS_FLTALLFILTER_STRING));
+	CFileDialog dlg(TRUE, nullptr, nullptr, OFN_HIDEREADONLY | OFN_OVERWRITEPROMPT, GetResManager().LoadString(IDS_FLTALLFILTER_STRING));
 	if(dlg.DoModal() == IDOK)
 	{
 		unsigned long ulSize = 0;