lstr* replacements

git-svn-id: http://svn.miranda-ng.org/main/trunk@11176 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

5 files changed, 12 insertions, 12 deletions

diff --git a/plugins/Quotes/src/Chart.h b/plugins/Quotes/src/Chart.h
index 62a658d818..8cd4718b94 100644
--- a/plugins/Quotes/src/Chart.h
+++ b/plugins/Quotes/src/Chart.h
@@ -91,7 +91,7 @@ public:
 			HFONT hOldFont = static_cast<HFONT>(::SelectObject(hdc,hFont));

 

 			LPCTSTR pszText = TranslateT("There is no to show");

-			int nDrawTextResult = ::DrawText(hdc,pszText,::lstrlen(pszText),&rc,DT_SINGLELINE|DT_VCENTER|DT_CENTER);

+			int nDrawTextResult = ::DrawText(hdc,pszText,::mir_tstrlen(pszText),&rc,DT_SINGLELINE|DT_VCENTER|DT_CENTER);

 			assert(0 != nDrawTextResult);

 

 			::SelectObject(hdc,hOldFont);

diff --git a/plugins/Quotes/src/Forex.cpp b/plugins/Quotes/src/Forex.cpp
index 933e25c35b..02aaf99b39 100644
--- a/plugins/Quotes/src/Forex.cpp
+++ b/plugins/Quotes/src/Forex.cpp
@@ -375,7 +375,7 @@ namespace
 // 	{

 // 		if(lParam)

 // 		{

-// 			lstrcpynA(reinterpret_cast<char*>(lParam),QUOTES_PROTOCOL_NAME,wParam);

+// 			mir_strncpy(reinterpret_cast<char*>(lParam),QUOTES_PROTOCOL_NAME,wParam);

 // 			return 0;

 // 		}

 // 		else

diff --git a/plugins/Quotes/src/ImportExport.cpp b/plugins/Quotes/src/ImportExport.cpp
index a6c46e894f..6a01feb58f 100644
--- a/plugins/Quotes/src/ImportExport.cpp
+++ b/plugins/Quotes/src/ImportExport.cpp
@@ -170,12 +170,12 @@ namespace
 	{

 		LPTSTR p = pszBuffer;

 		LPCTSTR pszXml = TranslateT("XML File (*.xml)");

-		lstrcpyn(p,pszXml, (int)cBuffer);

-		size_t nLen = lstrlen(pszXml)+1;

+		mir_tstrncpy(p,pszXml, (int)cBuffer);

+		size_t nLen = mir_tstrlen(pszXml)+1;

 		p+= nLen;

 		if(nLen < cBuffer)

 		{

-			lstrcpyn(p,_T("*.xml"),(int)(cBuffer-nLen));

+			mir_tstrncpy(p,_T("*.xml"),(int)(cBuffer-nLen));

 			p+= 6;

 			nLen += 6;

 		}

@@ -183,15 +183,15 @@ namespace
 		if(nLen < cBuffer)

 		{

 			LPCTSTR pszAll = TranslateT("All files (*.*)");

-			lstrcpyn(p,pszAll,(int)(cBuffer-nLen));

-			size_t n = lstrlen(pszAll)+1;

+			mir_tstrncpy(p,pszAll,(int)(cBuffer-nLen));

+			size_t n = mir_tstrlen(pszAll)+1;

 			nLen += n;

 			p+= n;

 		}

 

 		if(nLen < cBuffer)

 		{

-			lstrcpyn(p,_T("*.*"),(int)(cBuffer-nLen));

+			mir_tstrncpy(p,_T("*.*"),(int)(cBuffer-nLen));

 			p+= 4;

 			nLen += 4;

 		}

diff --git a/plugins/Quotes/src/QuotesProviderBase.cpp b/plugins/Quotes/src/QuotesProviderBase.cpp
index d05d21f304..c6553a1c68 100644
--- a/plugins/Quotes/src/QuotesProviderBase.cpp
+++ b/plugins/Quotes/src/QuotesProviderBase.cpp
@@ -576,7 +576,7 @@ namespace
 		dbei.timestamp = static_cast<DWORD>(nTime);

 		dbei.flags = DBEF_READ|DBEF_UTF;

 		dbei.eventType = EVENTTYPE_MESSAGE;

-		dbei.cbBlob = ::lstrlenA(psz)+1;

+		dbei.cbBlob = ::mir_strlen(psz)+1;

 		dbei.pBlob = (PBYTE)(char*)psz;

 		db_event_add(hContact, &dbei);

 	}

@@ -634,11 +634,11 @@ namespace
 			CQuotesProviderVisitorFormater visitor(hContact,_T('s'),0);

 			pProvider->Accept(visitor);

 			const tstring& sTitle = visitor.GetResult();

-			lstrcpyn(ppd.lptzContactName,sTitle.c_str(),MAX_CONTACTNAME);

+			mir_tstrncpy(ppd.lptzContactName,sTitle.c_str(),MAX_CONTACTNAME);

 

 			mir_safe_string<TCHAR> ss(variables_parsedup((TCHAR*)rsFormat.c_str(), 0, hContact));

 			tstring sText = format_rate(pProvider,hContact,ss.m_p,dRate);

-			lstrcpyn(ppd.lptzText,sText.c_str(),MAX_SECONDLINE);

+			mir_tstrncpy(ppd.lptzText,sText.c_str(),MAX_SECONDLINE);

 

 			if(CPopupSettings::colourDefault == ps.GetColourMode())

 			{

diff --git a/plugins/Quotes/src/SettingsDlg.cpp b/plugins/Quotes/src/SettingsDlg.cpp
index 48f190f1c4..940241b539 100644
--- a/plugins/Quotes/src/SettingsDlg.cpp
+++ b/plugins/Quotes/src/SettingsDlg.cpp
@@ -1066,7 +1066,7 @@ tstring GenerateLogFileName(const tstring& rsLogFilePattern,
 		{

 			tstring s = rsQuoteSymbol;

 			std::for_each(s.begin(),s.end(),boost::bind(replace_invalid_char,_1,_T('_')));

-			sPath.replace(n,lstrlen(g_pszVariableQuoteName),s.c_str());

+			sPath.replace(n,mir_tstrlen(g_pszVariableQuoteName),s.c_str());

 		}

 	}