lstr* replacements

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

2 files changed, 21 insertions, 21 deletions

diff --git a/plugins/YAMN/src/browser/badconnect.cpp b/plugins/YAMN/src/browser/badconnect.cpp
index f113392917..3387028fc8 100644
--- a/plugins/YAMN/src/browser/badconnect.cpp
+++ b/plugins/YAMN/src/browser/badconnect.cpp
@@ -38,11 +38,11 @@ LRESULT CALLBACK BadConnectPopupProc(HWND hWnd,UINT msg,WPARAM wParam,LPARAM lPa
 						Command = new WCHAR[wcslen(ActualAccount->BadConnectN.App)+6];

 

 					if (Command != NULL) {

-						lstrcpyW(Command,L"\"");

-						lstrcatW(Command,ActualAccount->BadConnectN.App);

-						lstrcatW(Command,L"\" ");

+						mir_wstrcpy(Command,L"\"");

+						mir_wstrcat(Command,ActualAccount->BadConnectN.App);

+						mir_wstrcat(Command,L"\" ");

 						if (ActualAccount->BadConnectN.AppParam != NULL)

-							lstrcatW(Command,ActualAccount->BadConnectN.AppParam);

+							mir_wstrcat(Command,ActualAccount->BadConnectN.AppParam);

 						CreateProcessW(NULL,Command,NULL,NULL,FALSE,NORMAL_PRIORITY_CLASS,NULL,NULL,&si,&pi);

 						delete[] Command;

 					}

@@ -119,13 +119,13 @@ INT_PTR CALLBACK DlgProcYAMNBadConnection(HWND hDlg,UINT msg,WPARAM wParam,LPARA
 

 				BadConnectPopup.PluginWindowProc = BadConnectPopupProc;

 				BadConnectPopup.PluginData = ActualAccount;

-				lstrcpyn(BadConnectPopup.lptzContactName, _A2T(ActualAccount->Name), SIZEOF(BadConnectPopup.lptzContactName));

+				mir_tstrncpy(BadConnectPopup.lptzContactName, _A2T(ActualAccount->Name), SIZEOF(BadConnectPopup.lptzContactName));

 			}

 

 			if (ActualAccount->Plugin->Fcn != NULL && ActualAccount->Plugin->Fcn->GetErrorStringWFcnPtr != NULL) {

 				Message1W = ActualAccount->Plugin->Fcn->GetErrorStringWFcnPtr(ErrorCode);

 				SetDlgItemText(hDlg,IDC_STATICMSG,Message1W);

-				lstrcpyn(BadConnectPopup.lptzText,Message1W,sizeof(BadConnectPopup.lptzText));

+				mir_tstrncpy(BadConnectPopup.lptzText,Message1W,sizeof(BadConnectPopup.lptzText));

 				if (ShowPopup)

 					PUAddPopupT(&BadConnectPopup);

 			}

@@ -133,7 +133,7 @@ INT_PTR CALLBACK DlgProcYAMNBadConnection(HWND hDlg,UINT msg,WPARAM wParam,LPARA
 			{

 				Message1W=ActualAccount->Plugin->Fcn->GetErrorStringWFcnPtr(ErrorCode);

 				SetDlgItemText(hDlg,IDC_STATICMSG,Message1W);

-				lstrcpyn(BadConnectPopup.lptzText,Message1W,sizeof(BadConnectPopup.lptzText));

+				mir_tstrncpy(BadConnectPopup.lptzText,Message1W,sizeof(BadConnectPopup.lptzText));

 				if (ShowPopup)

 					PUAddPopupT(&BadConnectPopup);

 			}

@@ -141,7 +141,7 @@ INT_PTR CALLBACK DlgProcYAMNBadConnection(HWND hDlg,UINT msg,WPARAM wParam,LPARA
 			{

 				Message1W=TranslateT("Unknown error");

 				SetDlgItemText(hDlg,IDC_STATICMSG,Message1W);

-				lstrcpyn(BadConnectPopup.lptzText,Message1W,sizeof(BadConnectPopup.lptzText));

+				mir_tstrncpy(BadConnectPopup.lptzText,Message1W,sizeof(BadConnectPopup.lptzText));

 				if (ShowPopup)

 					PUAddPopupT(&BadConnectPopup);

 			}

diff --git a/plugins/YAMN/src/browser/mailbrowser.cpp b/plugins/YAMN/src/browser/mailbrowser.cpp
index cda180d5ac..c983eadddf 100644
--- a/plugins/YAMN/src/browser/mailbrowser.cpp
+++ b/plugins/YAMN/src/browser/mailbrowser.cpp
@@ -601,8 +601,8 @@ int AddNewMailsToListView(HWND hListView,HACCOUNT ActualAccount,struct CMailNumb
 		}
 
 		if ((nflags & YAMN_ACC_POP) && (ActualAccount->Flags & YAMN_ACC_POPN) && (msgq->Flags & YAMN_MSG_POPUP) && (msgq->Flags & YAMN_MSG_NEW)) {
-			lstrcpyn(NewMailPopup.lptzContactName, FromStr, SIZEOF(NewMailPopup.lptzContactName));
-			lstrcpyn(NewMailPopup.lptzText, UnicodeHeader.Subject, SIZEOF(NewMailPopup.lptzText));
+			mir_tstrncpy(NewMailPopup.lptzContactName, FromStr, SIZEOF(NewMailPopup.lptzContactName));
+			mir_tstrncpy(NewMailPopup.lptzText, UnicodeHeader.Subject, SIZEOF(NewMailPopup.lptzText));
 
 			PYAMN_MAILSHOWPARAM MailParam = (PYAMN_MAILSHOWPARAM)malloc(sizeof(YAMN_MAILSHOWPARAM));
 			if (MailParam) {
@@ -690,7 +690,7 @@ void DoMailActions(HWND hDlg,HACCOUNT ActualAccount,struct CMailNumbers *MN,DWOR
 		NewMailPopup.PluginWindowProc = NewMailPopupProc;
 		NewMailPopup.PluginData = (void *)0;	//multiple popups
 
-		lstrcpyn(NewMailPopup.lptzContactName, _A2T(ActualAccount->Name), SIZEOF(NewMailPopup.lptzContactName));
+		mir_tstrncpy(NewMailPopup.lptzContactName, _A2T(ActualAccount->Name), SIZEOF(NewMailPopup.lptzContactName));
 		mir_sntprintf(NewMailPopup.lptzText, SIZEOF(NewMailPopup.lptzText), TranslateT("%d new mail message(s), %d total"), MN->Real.PopupNC + MN->Virtual.PopupNC, MN->Real.PopupTC + MN->Virtual.PopupTC);
 		PUAddPopupT(&NewMailPopup);
 	}
@@ -764,11 +764,11 @@ void DoMailActions(HWND hDlg,HACCOUNT ActualAccount,struct CMailNumbers *MN,DWOR
 		
 				if (Command != NULL)
 				{
-					lstrcpyW(Command,L"\"");
-					lstrcatW(Command,ActualAccount->NewMailN.App);
-					lstrcatW(Command,L"\" ");
+					mir_wstrcpy(Command,L"\"");
+					mir_wstrcat(Command,ActualAccount->NewMailN.App);
+					mir_wstrcat(Command,L"\" ");
 					if (ActualAccount->NewMailN.AppParam != NULL)
-						lstrcatW(Command,ActualAccount->NewMailN.AppParam);
+						mir_wstrcat(Command,ActualAccount->NewMailN.AppParam);
 					CreateProcessW(NULL,Command,NULL,NULL,FALSE,NORMAL_PRIORITY_CLASS,NULL,NULL,&si,&pi);
 					delete[] Command;
 				}
@@ -793,11 +793,11 @@ void DoMailActions(HWND hDlg,HACCOUNT ActualAccount,struct CMailNumbers *MN,DWOR
 		NoNewMailPopup.PluginWindowProc=NoNewMailPopupProc;
 		NoNewMailPopup.PluginData=(void *)0;					//it's not new mail popup
 
-		lstrcpyn(NoNewMailPopup.lptzContactName,_A2T(ActualAccount->Name),SIZEOF(NoNewMailPopup.lptzContactName));
+		mir_tstrncpy(NoNewMailPopup.lptzContactName,_A2T(ActualAccount->Name),SIZEOF(NoNewMailPopup.lptzContactName));
 		if (MN->Real.PopupSL2NC+MN->Virtual.PopupSL2NC)
 			mir_sntprintf(NoNewMailPopup.lptzText, SIZEOF(NoNewMailPopup.lptzText), TranslateT("No new mail message, %d spam(s)"), MN->Real.PopupSL2NC + MN->Virtual.PopupSL2NC);
 		else
-			lstrcpyn(NoNewMailPopup.lptzText,TranslateT("No new mail message"),SIZEOF(NoNewMailPopup.lptzText));
+			mir_tstrncpy(NoNewMailPopup.lptzText,TranslateT("No new mail message"),SIZEOF(NoNewMailPopup.lptzText));
 		PUAddPopupT(&NoNewMailPopup);
 	}
 
@@ -2077,11 +2077,11 @@ INT_PTR CALLBACK DlgProcYAMNMailBrowser(HWND hDlg,UINT msg,WPARAM wParam,LPARAM
 
 							if (Command != NULL)
 							{
-								lstrcpyW(Command,L"\"");
-								lstrcatW(Command,ActualAccount->NewMailN.App);
-								lstrcatW(Command,L"\" ");
+								mir_wstrcpy(Command,L"\"");
+								mir_wstrcat(Command,ActualAccount->NewMailN.App);
+								mir_wstrcat(Command,L"\" ");
 								if (ActualAccount->NewMailN.AppParam != NULL)
-									lstrcatW(Command,ActualAccount->NewMailN.AppParam);
+									mir_wstrcat(Command,ActualAccount->NewMailN.AppParam);
 								CreateProcessW(NULL,Command,NULL,NULL,FALSE,NORMAL_PRIORITY_CLASS,NULL,NULL,&si,&pi);
 								delete[] Command;
 							}