lstr* replacements

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

4 files changed, 12 insertions, 12 deletions

diff --git a/protocols/SkypeClassic/src/skype.cpp b/protocols/SkypeClassic/src/skype.cpp
index 52d08a6a45..8fc3c11d8e 100644
--- a/protocols/SkypeClassic/src/skype.cpp
+++ b/protocols/SkypeClassic/src/skype.cpp
@@ -214,12 +214,12 @@ int ShowMessage(int iconID, TCHAR *lpzText, int mustShow) {
 		MessagePopup.iSeconds = popupTimeSec;

 		MessagePopup.PluginData = (void *)1;

 

-		lstrcpy(MessagePopup.lptzText, lpzText);

+		mir_tstrcpy(MessagePopup.lptzText, lpzText);

 

 #ifdef _UNICODE

 		mbstowcs(MessagePopup.lptzContactName, SKYPE_PROTONAME, strlen(SKYPE_PROTONAME) + 1);

 #else

-		lstrcpy(MessagePopup.lptzContactName, SKYPE_PROTONAME);

+		mir_tstrcpy(MessagePopup.lptzContactName, SKYPE_PROTONAME);

 #endif

 

 		if (showPopup)

@@ -1548,9 +1548,9 @@ void RingThread(char *szSkypeMsg) {
 			InCallPopup.PluginWindowProc = InCallPopUpProc;

 			InCallPopup.PluginData = (void *)1;

 

-			lstrcpyn(InCallPopup.lptzText, TranslateT("Incoming Skype Call"), MAX_SECONDLINE);

+			mir_tstrncpy(InCallPopup.lptzText, TranslateT("Incoming Skype Call"), MAX_SECONDLINE);

 

-			lstrcpyn(InCallPopup.lptzContactName, lpzContactName, MAX_CONTACTNAME);

+			mir_tstrncpy(InCallPopup.lptzContactName, lpzContactName, MAX_CONTACTNAME);

 

 			if (showPopup)

 				CallService(MS_POPUP_ADDPOPUPT, (WPARAM)&InCallPopup, 0);

@@ -2477,7 +2477,7 @@ INT_PTR SkypeGetAvatarInfo(WPARAM wParam, LPARAM lParam)
 	{

 		if (!db_get_s(NULL, SKYPE_PROTONAME, "AvatarFile", &dbv))

 		{

-			lstrcpynA(AI->filename, dbv.pszVal, sizeof(AI->filename));

+			mir_strncpy(AI->filename, dbv.pszVal, sizeof(AI->filename));

 			db_free(&dbv);

 			return GAIR_SUCCESS;

 		}

diff --git a/protocols/SkypeClassic/src/skypeopt.cpp b/protocols/SkypeClassic/src/skypeopt.cpp
index f260107b2c..3caea3d09f 100644
--- a/protocols/SkypeClassic/src/skypeopt.cpp
+++ b/protocols/SkypeClassic/src/skypeopt.cpp
@@ -169,9 +169,9 @@ INT_PTR CALLBACK OptPopupDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPar
 					InCallPopup.iSeconds = popupTimeSec;

 					InCallPopup.PluginData = (void *)1;

 					

-					lstrcpy(InCallPopup.lptzText, TranslateT("Incoming Skype Call"));

+					mir_tstrcpy(InCallPopup.lptzText, TranslateT("Incoming Skype Call"));

 

-					lstrcpy(InCallPopup.lptzContactName, lpzContactName);

+					mir_tstrcpy(InCallPopup.lptzContactName, lpzContactName);

 

 					CallService(MS_POPUP_ADDPOPUPT,(WPARAM)&InCallPopup,0);

 

@@ -186,9 +186,9 @@ INT_PTR CALLBACK OptPopupDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPar
 					ErrorPopup.iSeconds = popupTimeSecErr;

 					ErrorPopup.PluginData = (void *)1;

 					

-					lstrcpy(ErrorPopup.lptzText, TranslateT("Preview Error Message"));

+					mir_tstrcpy(ErrorPopup.lptzText, TranslateT("Preview Error Message"));

 

-					lstrcpy(ErrorPopup.lptzContactName, _T("Error Message"));

+					mir_tstrcpy(ErrorPopup.lptzContactName, _T("Error Message"));

 

 

 					CallService(MS_POPUP_ADDPOPUPT,(WPARAM)&ErrorPopup,0);

diff --git a/protocols/SkypeClassic/src/skypesvc.cpp b/protocols/SkypeClassic/src/skypesvc.cpp
index b7ed84be4d..e5b1dc2c8e 100644
--- a/protocols/SkypeClassic/src/skypesvc.cpp
+++ b/protocols/SkypeClassic/src/skypesvc.cpp
@@ -168,7 +168,7 @@ INT_PTR SkypeGetAvatar(WPARAM wParam,LPARAM lParam)
 {

 	DBVARIANT dbv;

 	if (!db_get_s(NULL,SKYPE_PROTONAME, "AvatarFile", &dbv)){

-		lstrcpynA((char*)wParam, dbv.pszVal, (int)lParam);

+		mir_strncpy((char*)wParam, dbv.pszVal, (int)lParam);

 		db_free(&dbv);

 	}

 	return 0;

diff --git a/protocols/SkypeClassic/src/utf8.cpp b/protocols/SkypeClassic/src/utf8.cpp
index 8ae746e871..32a77231b3 100644
--- a/protocols/SkypeClassic/src/utf8.cpp
+++ b/protocols/SkypeClassic/src/utf8.cpp
@@ -287,7 +287,7 @@ static int convert_string(const char *fromcode, const char *tocode,
   size_t fromlen;

   char *s;

 

-  fromlen = lstrlen(from);

+  fromlen = mir_tstrlen(from);

   ret = convert_buffer(fromcode, tocode, from, fromlen, to, 0);

   if (ret == -2)

     return -1;

@@ -297,7 +297,7 @@ static int convert_string(const char *fromcode, const char *tocode,
   s = malloc(fromlen + 1);

   if (!s)

     return -1;

-  lstrcpy(s, from);

+  mir_tstrcpy(s, from);

   *to = s;

   for (; *s; s++)

     if (*s & ~0x7f)