lstr* replacements

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

4 files changed, 8 insertions, 8 deletions

diff --git a/plugins/SMS/src/SMS_svc.cpp b/plugins/SMS/src/SMS_svc.cpp
index 89f751dbde..28d787b4c3 100644
--- a/plugins/SMS/src/SMS_svc.cpp
+++ b/plugins/SMS/src/SMS_svc.cpp
@@ -10,7 +10,7 @@ int LoadServices(void)
 	// Service creation

 	for (size_t i=0;i<SIZEOF(siPluginServices);i++)

 	{

-		CopyMemory(pszServiceFunctionName,siPluginServices[i].lpszName,(lstrlenA(siPluginServices[i].lpszName)+1));

+		CopyMemory(pszServiceFunctionName,siPluginServices[i].lpszName,(mir_strlen(siPluginServices[i].lpszName)+1));

 		CreateServiceFunction(szServiceFunction,(MIRANDASERVICE)siPluginServices[i].lpFunc);

 	}

 	return 0;

diff --git a/plugins/SMS/src/functions.cpp b/plugins/SMS/src/functions.cpp
index cdf497067e..4d40969b44 100644
--- a/plugins/SMS/src/functions.cpp
+++ b/plugins/SMS/src/functions.cpp
@@ -7,7 +7,7 @@ BOOL DB_GetStaticStringW(MCONTACT hContact,LPSTR lpszModule,LPSTR lpszValueName,
 	DBVARIANT dbv={0};

 	if (db_get_ws(hContact, lpszModule, lpszValueName, &dbv)==0)

 	{

-		dwReadedStringLen=lstrlenW(dbv.pwszVal);

+		dwReadedStringLen=mir_wstrlen(dbv.pwszVal);

 		if (lpwszRetBuff && (dwRetBuffSize>dwReadedStringLen))

 		{

 			CopyMemory(lpwszRetBuff,dbv.pszVal,(dwReadedStringLen*sizeof(WCHAR)));//include null terminated

@@ -455,9 +455,9 @@ void LoadMsgDlgFont(int i,LOGFONT *lf,COLORREF *colour)
 	{

 		if (db_get(NULL,SRMMMOD,str,&dbv))

 		{

-			lstrcpyn(lf->lfFaceName,fontOptionsList[0].szDefFace,SIZEOF(lf->lfFaceName));

+			mir_tstrncpy(lf->lfFaceName,fontOptionsList[0].szDefFace,SIZEOF(lf->lfFaceName));

 		}else{

-			lstrcpyn(lf->lfFaceName,dbv.ptszVal,SIZEOF(lf->lfFaceName));

+			mir_tstrncpy(lf->lfFaceName,dbv.ptszVal,SIZEOF(lf->lfFaceName));

 			db_free(&dbv);

 		}

 

diff --git a/plugins/SMS/src/receive.cpp b/plugins/SMS/src/receive.cpp
index 49838ca61f..49d0283e59 100644
--- a/plugins/SMS/src/receive.cpp
+++ b/plugins/SMS/src/receive.cpp
@@ -42,7 +42,7 @@ int handleAckSMS(WPARAM wParam, LPARAM lParam)
 	ACKDATA *ack = ((ACKDATA*)lParam);

 

 	if (lpszXML)

-		dwXMLSize = lstrlenA(lpszXML);

+		dwXMLSize = mir_strlen(lpszXML);

 

 	if (GetXMLFieldEx(lpszXML,dwXMLSize,&lpszData,&dwDataSize,"sms_message", "text", NULL))

 	{

diff --git a/plugins/SMS/src/senddlg.cpp b/plugins/SMS/src/senddlg.cpp
index 7035b7449f..3d2a74c756 100644
--- a/plugins/SMS/src/senddlg.cpp
+++ b/plugins/SMS/src/senddlg.cpp
@@ -286,7 +286,7 @@ INT_PTR CALLBACK SendSmsDlgProc(HWND hWndDlg,UINT message,WPARAM wParam,LPARAM l
 						tvi.pszText=tszPhone;

 						tvi.cchTextMax=SIZEOF(tszPhone);

 						TreeView_GetItem(GetDlgItem(hWndDlg,IDC_NUMBERSLIST),&tvi);

-						dwPhoneSize=lstrlen(tszPhone);

+						dwPhoneSize=mir_tstrlen(tszPhone);

 					}else{

 						dwPhoneSize=GetDlgItemText(hWndDlg,IDC_ADDRESS,tszPhone,SIZEOF(tszPhone));

 					}

@@ -409,7 +409,7 @@ INT_PTR CALLBACK SendSmsDlgProc(HWND hWndDlg,UINT message,WPARAM wParam,LPARAM l
 				{

 					if (IsContactPhone(psswdWindowData->hMyContact,tszPhone,dwPhoneSize)==FALSE)

 					{

-						lstrcat(tszPhone, _T(" SMS"));

+						mir_tstrcat(tszPhone, _T(" SMS"));

 						for(DWORD i=0;bCont;i++)

 						{

 							mir_snprintf(szBuff,SIZEOF(szBuff),"MyPhone%d",i);

@@ -883,7 +883,7 @@ void SendSMSWindowNext(HWND hWndDlg)
 	tvi.cchTextMax=SIZEOF(tszPhone);

 	TreeView_GetItem(GetDlgItem(hWndDlg,IDC_NUMBERSLIST),&tvi);

 	TreeView_SelectItem(GetDlgItem(hWndDlg,IDC_NUMBERSLIST),tvi.hItem);

-	dwPhoneSize=lstrlenW(tszPhone);

+	dwPhoneSize=mir_wstrlen(tszPhone);

 	SendSMSWindowNumberSet(hWndDlg,tszPhone,dwPhoneSize);

 	StartSmsSend(hWndDlg,SendDlgItemMessage(hWndDlg,IDC_ACCOUNTS,CB_GETCURSEL,0,0),tszPhone,dwPhoneSize,lptszMessage,dwMessageSize);

 	SetTimer(hWndDlg,TIMERID_MSGSEND,TIMEOUT_MSGSEND,NULL);