From 688f55ba998c19304a29727c910504903f4cc49a Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Sun, 30 Nov 2014 18:51:36 +0000
Subject: lstr* replacements

git-svn-id: http://svn.miranda-ng.org/main/trunk@11176 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 protocols/IRCG/src/services.cpp | 40 ++++++++++++++++++++--------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

(limited to 'protocols/IRCG/src/services.cpp')

diff --git a/protocols/IRCG/src/services.cpp b/protocols/IRCG/src/services.cpp
index 7579f1775e..b7a9f14381 100644
--- a/protocols/IRCG/src/services.cpp
+++ b/protocols/IRCG/src/services.cpp
@@ -328,7 +328,7 @@ INT_PTR __cdecl CIrcProto::OnMenuIgnore(WPARAM wp, LPARAM)
 				host = dbv1.pszVal;
 
 			if (host) {
-				String S;
+				CMStringA S;
 				if (m_ignoreChannelDefault)
 					S = "+qnidcm";
 				else
@@ -421,47 +421,47 @@ static void DoChatFormatting(TCHAR* pszText)
 			switch (p1[1]) {
 			case 'B':
 			case 'b':
-				lstrcpy(InsertThis, _T("\002"));
+				mir_tstrcpy(InsertThis, _T("\002"));
 				iRemoveChars = 2;
 				break;
 			case 'I':
 			case 'i':
-				lstrcpy(InsertThis, _T("\026"));
+				mir_tstrcpy(InsertThis, _T("\026"));
 				iRemoveChars = 2;
 				break;
 			case 'U':
 			case 'u':
-				lstrcpy(InsertThis, _T("\037"));
+				mir_tstrcpy(InsertThis, _T("\037"));
 				iRemoveChars = 2;
 				break;
 			case 'c':
 			{
-				lstrcpy(InsertThis, _T("\003"));
+				mir_tstrcpy(InsertThis, _T("\003"));
 				iRemoveChars = 2;
 
 				TCHAR szTemp[3];
-				lstrcpyn(szTemp, p1 + 2, 3);
+				mir_tstrncpy(szTemp, p1 + 2, 3);
 				iFG = _ttoi(szTemp);
 			}
 				break;
 			case 'C':
 				if (p1[2] == '%' && p1[3] == 'F') {
-					lstrcpy(InsertThis, _T("\00399,99"));
+					mir_tstrcpy(InsertThis, _T("\00399,99"));
 					iRemoveChars = 4;
 				}
 				else {
-					lstrcpy(InsertThis, _T("\00399"));
+					mir_tstrcpy(InsertThis, _T("\00399"));
 					iRemoveChars = 2;
 				}
 				iFG = -1;
 				break;
 			case 'f':
 				if (p1 - 3 >= pszText && p1[-3] == '\003')
-					lstrcpy(InsertThis, _T(","));
+					mir_tstrcpy(InsertThis, _T(","));
 				else if (iFG >= 0)
 					mir_sntprintf(InsertThis, SIZEOF(InsertThis), _T("\003%u,"), iFG);
 				else
-					lstrcpy(InsertThis, _T("\00399,"));
+					mir_tstrcpy(InsertThis, _T("\00399,"));
 
 				iRemoveChars = 2;
 				break;
@@ -470,12 +470,12 @@ static void DoChatFormatting(TCHAR* pszText)
 				if (iFG >= 0)
 					mir_sntprintf(InsertThis, SIZEOF(InsertThis), _T("\003%u,99"), iFG);
 				else
-					lstrcpy(InsertThis, _T("\00399,99"));
+					mir_tstrcpy(InsertThis, _T("\00399,99"));
 				iRemoveChars = 2;
 				break;
 
 			case '%':
-				lstrcpy(InsertThis, _T("%"));
+				mir_tstrcpy(InsertThis, _T("%"));
 				iRemoveChars = 2;
 				break;
 
@@ -484,10 +484,10 @@ static void DoChatFormatting(TCHAR* pszText)
 				break;
 			}
 
-			MoveMemory(p1 + lstrlen(InsertThis), p1 + iRemoveChars, sizeof(TCHAR)*(lstrlen(p1) - iRemoveChars + 1));
-			CopyMemory(p1, InsertThis, sizeof(TCHAR)*lstrlen(InsertThis));
-			if (iRemoveChars || lstrlen(InsertThis))
-				p1 += lstrlen(InsertThis);
+			MoveMemory(p1 + mir_tstrlen(InsertThis), p1 + iRemoveChars, sizeof(TCHAR)*(mir_tstrlen(p1) - iRemoveChars + 1));
+			CopyMemory(p1, InsertThis, sizeof(TCHAR)*mir_tstrlen(InsertThis));
+			if (iRemoveChars || mir_tstrlen(InsertThis))
+				p1 += mir_tstrlen(InsertThis);
 			else
 				p1++;
 		}
@@ -517,8 +517,8 @@ int __cdecl CIrcProto::GCEventHook(WPARAM wParam, LPARAM lParam)
 
 			case GC_USER_MESSAGE:
 				if (gch && gch->ptszText && *gch->ptszText) {
-					TCHAR* pszText = new TCHAR[lstrlen(gch->ptszText) + 1000];
-					lstrcpy(pszText, gch->ptszText);
+					TCHAR* pszText = new TCHAR[mir_tstrlen(gch->ptszText) + 1000];
+					mir_tstrcpy(pszText, gch->ptszText);
 					DoChatFormatting(pszText);
 					PostIrcMessageWnd(p1, NULL, pszText);
 					delete[]pszText;
@@ -877,8 +877,8 @@ int __cdecl CIrcProto::GCMenuHook(WPARAM, LPARAM lParam)
 
 				TCHAR stzChanName[100];
 				const TCHAR* temp = _tcschr(gcmi->pszID, ' ');
-				int len = min(((temp == NULL) ? lstrlen(gcmi->pszID) : (int)(temp - gcmi->pszID + 1)), SIZEOF(stzChanName) - 1);
-				lstrcpyn(stzChanName, gcmi->pszID, len);
+				size_t len = min(((temp == NULL) ? mir_tstrlen(gcmi->pszID) : (int)(temp - gcmi->pszID + 1)), SIZEOF(stzChanName) - 1);
+				mir_tstrncpy(stzChanName, gcmi->pszID, len);
 				stzChanName[len] = 0;
 				CHANNELINFO *wi = (CHANNELINFO *)DoEvent(GC_EVENT_GETITEMDATA, stzChanName, NULL, NULL, NULL, NULL, NULL, false, false, 0);
 				BOOL bServOwner = strchr(sUserModes.c_str(), 'q') == NULL ? FALSE : TRUE;
-- 
cgit v1.2.3