4 files changed, 7 insertions, 7 deletions
diff --git a/protocols/Xfire/src/main.cpp b/protocols/Xfire/src/main.cpp
index df4a9686e3..92b3599b51 100644
--- a/protocols/Xfire/src/main.cpp
+++ b/protocols/Xfire/src/main.cpp
@@ -1410,7 +1410,7 @@ INT_PTR GetCaps(WPARAM wParam, LPARAM lParam)
 //=======================================================
 INT_PTR GetName(WPARAM wParam, LPARAM lParam)
 {
-	lstrcpynA((char*)lParam, "XFire", wParam);
+	mir_strncpy((char*)lParam, "XFire", wParam);
 	return 0;
 }
 
@@ -1802,7 +1802,7 @@ void SetAvatar(LPVOID lparam)
 		AI.cbSize = sizeof(AI);
 		AI.format = av.type;
 		AI.hContact = xsa->hContact;
-		lstrcpy(AI.filename, _A2T(av.file));
+		mir_tstrcpy(AI.filename, _A2T(av.file));
 		ProtoBroadcastAck(protocolname, xsa->hContact, ACKTYPE_AVATAR, ACKRESULT_SUCCESS, (HANDLE)&AI, 0);
 	}
 
@@ -3048,7 +3048,7 @@ INT_PTR BasicSearch(WPARAM wParam, LPARAM lParam) {
 		if (myClient != NULL)
 			if (myClient->client->connected)
 			{
-			lstrcpynA(buf, (const char *)lParam, 50);
+			mir_strncpy(buf, (const char *)lParam, 50);
 			mir_forkthread(AckBasicSearch, &buf);
 			return 1;
 			}
diff --git a/protocols/Xfire/src/options.cpp b/protocols/Xfire/src/options.cpp
index e3daffe50d..f7ee82d0ad 100644
--- a/protocols/Xfire/src/options.cpp
+++ b/protocols/Xfire/src/options.cpp
@@ -270,7 +270,7 @@ static INT_PTR CALLBACK DlgProcOpts2(HWND hwndDlg, UINT msg, WPARAM wParam, LPAR
 				db_free(&dbv);
 
 			//den login lowercasen
-			int size = lstrlenA(login);
+			int size = mir_strlen(login);
 			BOOL mustlowercase = FALSE;
 			for (int i = 0; i < size; i++)
 			{
diff --git a/protocols/Xfire/src/processbuddyinfo.cpp b/protocols/Xfire/src/processbuddyinfo.cpp
index 68a5994d34..4d92a63f51 100644
--- a/protocols/Xfire/src/processbuddyinfo.cpp
+++ b/protocols/Xfire/src/processbuddyinfo.cpp
@@ -94,7 +94,7 @@ void ProcessBuddyInfo(xfirelib::BuddyInfoPacket *buddyinfo, MCONTACT hcontact, c
 			AI.cbSize = sizeof(AI);
 			AI.format = type;
 			AI.hContact = hcontact;
-			lstrcpy(AI.filename, _A2T(filename));
+			mir_tstrcpy(AI.filename, _A2T(filename));
 			ProtoBroadcastAck(protocolname, hcontact, ACKTYPE_AVATAR, ACKRESULT_SUCCESS, (HANDLE)&AI, 0);
 		}
 		else //eigenen avatar setzen
diff --git a/protocols/Xfire/src/tools.cpp b/protocols/Xfire/src/tools.cpp
index 42d8299505..5c42c159b1 100644
--- a/protocols/Xfire/src/tools.cpp
+++ b/protocols/Xfire/src/tools.cpp
@@ -100,8 +100,8 @@ int displayPopup(HWND hWnd, LPCSTR lpText, LPCSTR lpCaption, UINT uType, HICON h
 			bIconsNotLoaded = FALSE;
 		}
 
-		lstrcpyn(ppd.lptzContactName, _A2T(lpCaption), SIZEOF(ppd.lptzContactName));
-		lstrcpyn(ppd.lptzText, _A2T(lpText), SIZEOF(ppd.lptzText));
+		mir_tstrncpy(ppd.lptzContactName, _A2T(lpCaption), SIZEOF(ppd.lptzContactName));
+		mir_tstrncpy(ppd.lptzText, _A2T(lpText), SIZEOF(ppd.lptzText));
 
 		if ((uType & MB_ICONMASK) == MB_ICONSTOP) {
 			ppd.lchIcon = hicError;