lstr* replacements

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

2 files changed, 12 insertions, 12 deletions

diff --git a/src/modules/findadd/findadd.cpp b/src/modules/findadd/findadd.cpp
index 033ae492c0..f68c502ea2 100644
--- a/src/modules/findadd/findadd.cpp
+++ b/src/modules/findadd/findadd.cpp
@@ -341,7 +341,7 @@ static INT_PTR CALLBACK DlgProcFindAdd(HWND hwndDlg, UINT msg, WPARAM wParam, LP
 			SelectObject(hdc, (HFONT)SendDlgItemMessage(hwndDlg, IDC_STATUSBAR, WM_GETFONT, 0, 0));
 
 			SIZE textSize;
-			GetTextExtentPoint32(hdc, TranslateT("Searching"), lstrlen(TranslateT("Searching")), &textSize);
+			GetTextExtentPoint32(hdc, TranslateT("Searching"), mir_tstrlen(TranslateT("Searching")), &textSize);
 
 			int partWidth[3];
 			partWidth[0] = textSize.cx;
@@ -380,7 +380,7 @@ static INT_PTR CALLBACK DlgProcFindAdd(HWND hwndDlg, UINT msg, WPARAM wParam, LP
 			SelectObject(hdc, (HFONT)SendDlgItemMessage(hwndDlg, IDC_PROTOLIST, WM_GETFONT, 0, 0));
 			if (netProtoCount > 1) {
 				cbei.pszText = TranslateT("All networks");
-				GetTextExtentPoint32(hdc, cbei.pszText, lstrlen(cbei.pszText), &textSize);
+				GetTextExtentPoint32(hdc, cbei.pszText, mir_tstrlen(cbei.pszText), &textSize);
 				if (textSize.cx > cbwidth)
 					cbwidth = textSize.cx;
 				cbei.iImage = cbei.iSelectedImage = ImageList_AddIcon_IconLibLoaded(dat->himlComboIcons, SKINICON_OTHER_SEARCHALL);
@@ -399,7 +399,7 @@ static INT_PTR CALLBACK DlgProcFindAdd(HWND hwndDlg, UINT msg, WPARAM wParam, LP
 					continue;
 
 				cbei.pszText = pa->tszAccountName;
-				GetTextExtentPoint32(hdc, cbei.pszText, lstrlen(cbei.pszText), &textSize);
+				GetTextExtentPoint32(hdc, cbei.pszText, mir_tstrlen(cbei.pszText), &textSize);
 				if (textSize.cx > cbwidth)
 					cbwidth = textSize.cx;
 
diff --git a/src/modules/findadd/searchresults.cpp b/src/modules/findadd/searchresults.cpp
index 19f8eae9cb..4386af1143 100644
--- a/src/modules/findadd/searchresults.cpp
+++ b/src/modules/findadd/searchresults.cpp
@@ -202,7 +202,7 @@ static void BeginSearchFailed(void * arg)
 			protoName, protoName);

 		mir_free((char*)arg);

 	}

-	else lstrcpyn(buf, TranslateT("Could not search on any of the protocols, are you online?"), SIZEOF(buf));

+	else mir_tstrncpy(buf, TranslateT("Could not search on any of the protocols, are you online?"), SIZEOF(buf));

 	MessageBox(0, buf, TranslateT("Problem with search"), MB_OK | MB_ICONERROR);

 }

 

@@ -258,17 +258,17 @@ void SetStatusBarSearchInfo(HWND hwndStatus, struct FindAddDlgData *dat)
 	if (dat->searchCount != 0) {

 		int i;

 

-		lstrcpy(str, TranslateT("Searching"));

+		mir_tstrcpy(str, TranslateT("Searching"));

 		for (i=0; i < dat->searchCount; i++) {

 			PROTOACCOUNT *pa = Proto_GetAccount(dat->search[i].szProto);

 			if (!pa)

 				continue;

 

-			lstrcat(str, i ? _T(", ") : _T(" "));

-			lstrcat(str, pa->tszAccountName);

+			mir_tstrcat(str, i ? _T(", ") : _T(" "));

+			mir_tstrcat(str, pa->tszAccountName);

 		}

 	}

-	else lstrcpy(str, TranslateT("Idle"));

+	else mir_tstrcpy(str, TranslateT("Idle"));

 

 	SendMessage(hwndStatus, SB_SETTEXT, 0, (LPARAM)str);

 }

@@ -322,16 +322,16 @@ void SetStatusBarResultInfo(HWND hwndDlg)
 				if (i) {

 					if ((pa = Proto_GetAccount(subtotal[i].szProto)) == NULL)

 						return;

-					lstrcat(str, _T(", "));

+					mir_tstrcat(str, _T(", "));

 				}

 				mir_sntprintf(substr, SIZEOF(substr), _T("%d %s"), subtotal[i].count, pa->tszAccountName);

-				lstrcat(str, substr);

+				mir_tstrcat(str, substr);

 			}

-			lstrcat(str, _T(")"));

+			mir_tstrcat(str, _T(")"));

 		}

 		mir_free(subtotal);

 	}

-	else lstrcpy(str, TranslateT("No users found"));

+	else mir_tstrcpy(str, TranslateT("No users found"));

 	SendMessage(hwndStatus, SB_SETTEXT, 2, (LPARAM)str);

 }