mir_tstrncpy <> _tcsncpy

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

13 files changed, 61 insertions, 61 deletions

diff --git a/plugins/TabSRMM/src/chat/options.cpp b/plugins/TabSRMM/src/chat/options.cpp
index ee5cfaeb4f..5becbc5910 100644
--- a/plugins/TabSRMM/src/chat/options.cpp
+++ b/plugins/TabSRMM/src/chat/options.cpp
@@ -494,62 +494,62 @@ void RegisterFontServiceFonts()
 	fid.cbSize = sizeof(FontIDT);

 	cid.cbSize = sizeof(ColourIDT);

 

-	mir_strncpy(fid.dbSettingsGroup, FONTMODULE, SIZEOF(fid.dbSettingsGroup));

+	strncpy(fid.dbSettingsGroup, FONTMODULE, SIZEOF(fid.dbSettingsGroup));

 

 	for (int i = 0; i < SIZEOF(IM_fontOptionsList); i++) {

 		fid.flags = FIDF_DEFAULTVALID | FIDF_ALLOWEFFECTS;

 		LoadMsgDlgFont(FONTSECTION_IM, i, &lf, &fontOptionsList[i].colour, FONTMODULE);

 		mir_snprintf(szTemp, SIZEOF(szTemp), "Font%d", i);

-		mir_strncpy(fid.prefix, szTemp, SIZEOF(fid.prefix));

+		strncpy(fid.prefix, szTemp, SIZEOF(fid.prefix));

 		fid.order = i;

-		mir_tstrncpy(fid.name, fontOptionsList[i].szDescr, SIZEOF(fid.name));

+		_tcsncpy(fid.name, fontOptionsList[i].szDescr, SIZEOF(fid.name));

 		fid.deffontsettings.colour = fontOptionsList[i].colour;

 		fid.deffontsettings.size = (char)lf.lfHeight;

 		fid.deffontsettings.style = (lf.lfWeight >= FW_BOLD ? FONTF_BOLD : 0) | (lf.lfItalic ? FONTF_ITALIC : 0);

 		fid.deffontsettings.charset = lf.lfCharSet;

 		fid.flags = fid.flags & ~FIDF_CLASSMASK | (fid.deffontsettings.style&FONTF_BOLD ? FIDF_CLASSHEADER : FIDF_CLASSGENERAL);

-		mir_tstrncpy(fid.deffontsettings.szFace, lf.lfFaceName, LF_FACESIZE);

-		mir_tstrncpy(fid.backgroundGroup, LPGENT("Message Sessions")_T("/")LPGENT("Single Messaging"), SIZEOF(fid.backgroundGroup));

-		mir_tstrncpy(fid.group, LPGENT("Message Sessions")_T("/")LPGENT("Single Messaging"), SIZEOF(fid.group));

+		_tcsncpy(fid.deffontsettings.szFace, lf.lfFaceName, LF_FACESIZE);

+		_tcsncpy(fid.backgroundGroup, LPGENT("Message Sessions")_T("/")LPGENT("Single Messaging"), SIZEOF(fid.backgroundGroup));

+		_tcsncpy(fid.group, LPGENT("Message Sessions")_T("/")LPGENT("Single Messaging"), SIZEOF(fid.group));

 		switch (i) {

 		case MSGFONTID_MYMSG:

 		case 1:

 		case MSGFONTID_MYNAME:

 		case MSGFONTID_MYTIME:

 		case 21:

-			mir_tstrncpy(fid.backgroundName, LPGENT("Outgoing background"), SIZEOF(fid.backgroundName));

+			_tcsncpy(fid.backgroundName, LPGENT("Outgoing background"), SIZEOF(fid.backgroundName));

 			break;

 		case 8:

 		case 9:

 		case 12:

 		case 13:

-			mir_tstrncpy(fid.backgroundName, LPGENT("Outgoing background(old)"), SIZEOF(fid.backgroundName));

+			_tcsncpy(fid.backgroundName, LPGENT("Outgoing background(old)"), SIZEOF(fid.backgroundName));

 			break;

 		case 10:

 		case 11:

 		case 14:

 		case 15:

-			mir_tstrncpy(fid.backgroundName, LPGENT("Incoming background(old)"), SIZEOF(fid.backgroundName));

+			_tcsncpy(fid.backgroundName, LPGENT("Incoming background(old)"), SIZEOF(fid.backgroundName));

 			break;

 		case MSGFONTID_MESSAGEAREA:

-			mir_tstrncpy(fid.group, LPGENT("Message Sessions"), SIZEOF(fid.group));

-			mir_tstrncpy(fid.backgroundGroup, LPGENT("Message Sessions"), SIZEOF(fid.backgroundGroup));

-			mir_tstrncpy(fid.backgroundName, LPGENT("Input area background"), SIZEOF(fid.backgroundName));

+			_tcsncpy(fid.group, LPGENT("Message Sessions"), SIZEOF(fid.group));

+			_tcsncpy(fid.backgroundGroup, LPGENT("Message Sessions"), SIZEOF(fid.backgroundGroup));

+			_tcsncpy(fid.backgroundName, LPGENT("Input area background"), SIZEOF(fid.backgroundName));

 			fid.flags |= FIDF_DISABLESTYLES;

 			fid.flags &= ~FIDF_ALLOWEFFECTS;

 			break;

 		case 17:

-			mir_tstrncpy(fid.backgroundName, LPGENT("Status background"), SIZEOF(fid.backgroundName));

+			_tcsncpy(fid.backgroundName, LPGENT("Status background"), SIZEOF(fid.backgroundName));

 			break;

 		case 18:

-			mir_tstrncpy(fid.backgroundGroup, LPGENT("Message Sessions"), SIZEOF(fid.backgroundGroup));

-			mir_tstrncpy(fid.backgroundName, LPGENT("Log background"), SIZEOF(fid.backgroundName));

+			_tcsncpy(fid.backgroundGroup, LPGENT("Message Sessions"), SIZEOF(fid.backgroundGroup));

+			_tcsncpy(fid.backgroundName, LPGENT("Log background"), SIZEOF(fid.backgroundName));

 			break;

 		case 19:

-			mir_tstrncpy(fid.backgroundName, _T(""), SIZEOF(fid.backgroundName));

+			_tcsncpy(fid.backgroundName, _T(""), SIZEOF(fid.backgroundName));

 			break;

 		default:

-			mir_tstrncpy(fid.backgroundName, LPGENT("Incoming background"), SIZEOF(fid.backgroundName));

+			_tcsncpy(fid.backgroundName, LPGENT("Incoming background"), SIZEOF(fid.backgroundName));

 			break;

 		}

 		FontRegisterT(&fid);

@@ -557,37 +557,37 @@ void RegisterFontServiceFonts()
 

 	fontOptionsList = IP_fontOptionsList;

 	fid.flags = FIDF_DEFAULTVALID | FIDF_ALLOWEFFECTS;

-	mir_tstrncpy(fid.group, LPGENT("Message Sessions")_T("/")LPGENT("Info Panel"), SIZEOF(fid.group));

-	mir_tstrncpy(fid.backgroundGroup, LPGENT("Message Sessions")_T("/")LPGENT("Info Panel"), SIZEOF(fid.backgroundGroup));

-	mir_tstrncpy(fid.backgroundName, LPGENT("Fields background"), SIZEOF(fid.backgroundName));

+	_tcsncpy(fid.group, LPGENT("Message Sessions")_T("/")LPGENT("Info Panel"), SIZEOF(fid.group));

+	_tcsncpy(fid.backgroundGroup, LPGENT("Message Sessions")_T("/")LPGENT("Info Panel"), SIZEOF(fid.backgroundGroup));

+	_tcsncpy(fid.backgroundName, LPGENT("Fields background"), SIZEOF(fid.backgroundName));

 	for (int i = 0; i < IPFONTCOUNT; i++) {

 		LoadMsgDlgFont(FONTSECTION_IP, i + 100, &lf, &fontOptionsList[i].colour, FONTMODULE);

 		mir_snprintf(szTemp, SIZEOF(szTemp), "Font%d", i + 100);

-		mir_strncpy(fid.prefix, szTemp, SIZEOF(fid.prefix));

+		strncpy(fid.prefix, szTemp, SIZEOF(fid.prefix));

 		fid.order = i + 100;

-		mir_tstrncpy(fid.name, fontOptionsList[i].szDescr, SIZEOF(fid.name));

+		_tcsncpy(fid.name, fontOptionsList[i].szDescr, SIZEOF(fid.name));

 		fid.deffontsettings.colour = fontOptionsList[i].colour;

 		fid.deffontsettings.size = (char)lf.lfHeight;

 		fid.deffontsettings.style = (lf.lfWeight >= FW_BOLD ? FONTF_BOLD : 0) | (lf.lfItalic ? FONTF_ITALIC : 0);

 		fid.deffontsettings.charset = lf.lfCharSet;

 		fid.flags = fid.flags & ~FIDF_CLASSMASK | (fid.deffontsettings.style&FONTF_BOLD ? FIDF_CLASSHEADER : FIDF_CLASSGENERAL);

 		fid.deffontsettings.charset = lf.lfCharSet;

-		mir_tstrncpy(fid.deffontsettings.szFace, lf.lfFaceName, LF_FACESIZE);

+		_tcsncpy(fid.deffontsettings.szFace, lf.lfFaceName, LF_FACESIZE);

 		if (i == IPFONTCOUNT - 1) {

-			mir_tstrncpy(fid.backgroundGroup, _T(""), SIZEOF(fid.backgroundGroup));

-			mir_tstrncpy(fid.backgroundName, _T(""), SIZEOF(fid.backgroundName));

-			mir_tstrncpy(fid.group, LPGENT("Message Sessions"), SIZEOF(fid.group));

+			_tcsncpy(fid.backgroundGroup, _T(""), SIZEOF(fid.backgroundGroup));

+			_tcsncpy(fid.backgroundName, _T(""), SIZEOF(fid.backgroundName));

+			_tcsncpy(fid.group, LPGENT("Message Sessions"), SIZEOF(fid.group));

 		}

 		FontRegisterT(&fid);

 	}

 

-	mir_tstrncpy(cid.group, LPGENT("Message Sessions")_T("/")LPGENT("Group chats"), SIZEOF(cid.group));

-	mir_strncpy(cid.dbSettingsGroup, CHAT_MODULE, SIZEOF(cid.dbSettingsGroup));

+	_tcsncpy(cid.group, LPGENT("Message Sessions")_T("/")LPGENT("Group chats"), SIZEOF(cid.group));

+	strncpy(cid.dbSettingsGroup, CHAT_MODULE, SIZEOF(cid.dbSettingsGroup));

 	for (int i = 0; i <= 7; i++) {

 		mir_snprintf(szTemp, SIZEOF(szTemp), "NickColor%d", i);

-		mir_tstrncpy(cid.name, chatcolorsnames[i], SIZEOF(cid.name));

+		_tcsncpy(cid.name, chatcolorsnames[i], SIZEOF(cid.name));

 		cid.order = i + 1;

-		mir_strncpy(cid.setting, szTemp, SIZEOF(cid.setting));

+		strncpy(cid.setting, szTemp, SIZEOF(cid.setting));

 		switch (i) {

 		case 5:

 			cid.defcolour = GetSysColor(COLOR_HIGHLIGHT);

@@ -613,14 +613,14 @@ void RegisterFontServiceFonts()
 	ColourRegisterT(&cid);

 

 	// static colors (info panel, tool bar background etc...)

-	mir_strncpy(fid.dbSettingsGroup, FONTMODULE, SIZEOF(fid.dbSettingsGroup));

-	mir_strncpy(cid.dbSettingsGroup, FONTMODULE, SIZEOF(fid.dbSettingsGroup));

+	strncpy(fid.dbSettingsGroup, FONTMODULE, SIZEOF(fid.dbSettingsGroup));

+	strncpy(cid.dbSettingsGroup, FONTMODULE, SIZEOF(fid.dbSettingsGroup));

 

 	for (int i = 0; i < SIZEOF(_clrs); i++) {

 		cid.order = _clrs[i].order;

-		mir_tstrncpy(cid.group, _clrs[i].tszGroup, SIZEOF(fid.group));

-		mir_tstrncpy(cid.name, _clrs[i].tszName, SIZEOF(cid.name));

-		mir_strncpy(cid.setting, _clrs[i].szSetting, SIZEOF(cid.setting));

+		_tcsncpy(cid.group, _clrs[i].tszGroup, SIZEOF(fid.group));

+		_tcsncpy(cid.name, _clrs[i].tszName, SIZEOF(cid.name));

+		strncpy(cid.setting, _clrs[i].szSetting, SIZEOF(cid.setting));

 		if (_clrs[i].def & 0xff000000)

 			cid.defcolour = GetSysColor(_clrs[i].def & 0x000000ff);

 		else

@@ -628,14 +628,14 @@ void RegisterFontServiceFonts()
 		ColourRegisterT(&cid);

 	}

 

-	mir_strncpy(cid.dbSettingsGroup, SRMSGMOD_T, SIZEOF(fid.dbSettingsGroup));

+	strncpy(cid.dbSettingsGroup, SRMSGMOD_T, SIZEOF(fid.dbSettingsGroup));

 

 	// text and background colors for tabs

 	for (int i = 0; i < SIZEOF(_tabclrs); i++) {

 		cid.order = _tabclrs[i].order;

-		mir_tstrncpy(cid.group, _tabclrs[i].tszGroup, SIZEOF(fid.group));

-		mir_tstrncpy(cid.name, _tabclrs[i].tszName, SIZEOF(cid.name));

-		mir_strncpy(cid.setting, _tabclrs[i].szSetting, SIZEOF(cid.setting));

+		_tcsncpy(cid.group, _tabclrs[i].tszGroup, SIZEOF(fid.group));

+		_tcsncpy(cid.name, _tabclrs[i].tszName, SIZEOF(cid.name));

+		strncpy(cid.setting, _tabclrs[i].szSetting, SIZEOF(cid.setting));

 		if (_tabclrs[i].def & 0xff000000)

 			cid.defcolour = GetSysColor(_tabclrs[i].def & 0x000000ff);

 		else

diff --git a/plugins/TabSRMM/src/chat/services.cpp b/plugins/TabSRMM/src/chat/services.cpp
index f996e50832..46c67ba0a1 100644
--- a/plugins/TabSRMM/src/chat/services.cpp
+++ b/plugins/TabSRMM/src/chat/services.cpp
@@ -168,7 +168,7 @@ void ShowRoom(SESSION_INFO *si, WPARAM, BOOL)
 	if (pContainer == NULL) {

 		GetContainerNameForContact(si->hContact, szName, CONTAINER_NAMELEN);

 		if (!g_Settings.bOpenInDefault && !mir_tstrcmp(szName, _T("default")))

-			mir_tstrncpy(szName, _T("Chat Rooms"), CONTAINER_NAMELEN);

+			_tcsncpy(szName, _T("Chat Rooms"), CONTAINER_NAMELEN);

 		szName[CONTAINER_NAMELEN] = 0;

 		pContainer = FindContainerByName(szName);

 	}

diff --git a/plugins/TabSRMM/src/container.cpp b/plugins/TabSRMM/src/container.cpp
index 1e3632a40d..61e9997c1c 100644
--- a/plugins/TabSRMM/src/container.cpp
+++ b/plugins/TabSRMM/src/container.cpp
@@ -1788,7 +1788,7 @@ TContainerData* TSAPI CreateContainer(const TCHAR *name, int iTemp, MCONTACT hCo
 	TContainerData *pContainer = (TContainerData*)mir_calloc(sizeof(TContainerData));

 	if (pContainer == NULL)

 		return NULL;

-	mir_tstrncpy(pContainer->szName, name, CONTAINER_NAMELEN + 1);

+	_tcsncpy(pContainer->szName, name, CONTAINER_NAMELEN + 1);

 	AppendToContainerList(pContainer);

 

 	if (M.GetByte("limittabs", 0) && !mir_tstrcmp(name, _T("default")))

diff --git a/plugins/TabSRMM/src/controls.cpp b/plugins/TabSRMM/src/controls.cpp
index 3282ca59e3..94fe049ccc 100644
--- a/plugins/TabSRMM/src/controls.cpp
+++ b/plugins/TabSRMM/src/controls.cpp
@@ -979,7 +979,7 @@ LONG_PTR CALLBACK StatusBarSubclassProc(HWND hWnd, UINT msg, WPARAM wParam, LPAR
 						_tcsncpy_s(wBuf, TranslateT("Session list.\nClick left for a list of open sessions.\nClick right to access favorites and quickly configure message window behavior"), _TRUNCATE);

 				}

 				else if (sid->tszTooltip)

-					mir_tstrncpy(wBuf, sid->tszTooltip, SIZEOF(wBuf));

+					_tcsncpy(wBuf, sid->tszTooltip, SIZEOF(wBuf));

 

 				if (wBuf[0]) {

 					CallService("mToolTip/ShowTipW", (WPARAM)wBuf, (LPARAM)&ti);

diff --git a/plugins/TabSRMM/src/eventpopups.cpp b/plugins/TabSRMM/src/eventpopups.cpp
index 40bbe9448c..f7d9d81686 100644
--- a/plugins/TabSRMM/src/eventpopups.cpp
+++ b/plugins/TabSRMM/src/eventpopups.cpp
@@ -532,7 +532,7 @@ static int PopupUpdateT(MCONTACT hContact, MEVENT hEvent)
 	TCHAR lpzText[MAX_SECONDLINE];

 	int i, available = MAX_SECONDLINE - 1;

 	if (pdata->pluginOptions->bShowHeaders) {

-		mir_tstrncpy(lpzText, szHeader, MAX_SECONDLINE);

+		_tcsncpy(lpzText, szHeader, MAX_SECONDLINE);

 		available -= (int)mir_tstrlen(szHeader);

 	}

 	else lpzText[0] = 0;

@@ -622,12 +622,12 @@ static int PopupShowT(NEN_OPTIONS *pluginOptions, MCONTACT hContact, MEVENT hEve
 		_tcsncpy_s(pud.lptzText, szPreview, _TRUNCATE);

 		mir_free(szPreview);

 	}

-	else mir_tstrncpy(pud.lptzText, _T(" "), MAX_SECONDLINE);

+	else _tcsncpy(pud.lptzText, _T(" "), MAX_SECONDLINE);

 

 	pdata->eventData = (EVENT_DATAT *)mir_alloc(NR_MERGED * sizeof(EVENT_DATAT));

 	pdata->eventData[0].hEvent = hEvent;

 	pdata->eventData[0].timestamp = dbe.timestamp;

-	mir_tstrncpy(pdata->eventData[0].tszText, pud.lptzText, MAX_SECONDLINE);

+	_tcsncpy(pdata->eventData[0].tszText, pud.lptzText, MAX_SECONDLINE);

 	pdata->eventData[0].tszText[MAX_SECONDLINE - 1] = 0;

 	pdata->nrEventsAlloced = NR_MERGED;

 	pdata->nrMerged = 1;

diff --git a/plugins/TabSRMM/src/generic_msghandlers.cpp b/plugins/TabSRMM/src/generic_msghandlers.cpp
index 68640fb48c..16cf2b8b38 100644
--- a/plugins/TabSRMM/src/generic_msghandlers.cpp
+++ b/plugins/TabSRMM/src/generic_msghandlers.cpp
@@ -813,7 +813,7 @@ void TSAPI DM_InitRichEdit(TWindowData *dat)
 		cf2.crTextColor = inputcharcolor;
 		cf2.bCharSet = lf.lfCharSet;
 		cf2.crBackColor = dat->inputbg;
-		mir_strncpy(cf2.szFaceName, lf.lfFaceName, LF_FACESIZE);
+		strncpy(cf2.szFaceName, lf.lfFaceName, LF_FACESIZE);
 		cf2.dwEffects = 0;
 		cf2.wWeight = (WORD)lf.lfWeight;
 		cf2.bPitchAndFamily = lf.lfPitchAndFamily;
@@ -830,7 +830,7 @@ void TSAPI DM_InitRichEdit(TWindowData *dat)
 		cf2.dwMask = CFM_COLOR | CFM_FACE | CFM_CHARSET | CFM_SIZE | CFM_WEIGHT | CFM_BOLD | CFM_ITALIC;
 		cf2.crTextColor = inputcharcolor;
 		cf2.bCharSet = lf.lfCharSet;
-		mir_strncpy(cf2.szFaceName, lf.lfFaceName, LF_FACESIZE-1);
+		strncpy(cf2.szFaceName, lf.lfFaceName, LF_FACESIZE-1);
 		cf2.dwEffects = ((lf.lfWeight >= FW_BOLD) ? CFE_BOLD : 0) | (lf.lfItalic ? CFE_ITALIC : 0) | (lf.lfUnderline ? CFE_UNDERLINE : 0) | (lf.lfStrikeOut ? CFE_STRIKEOUT : 0);
 		cf2.wWeight = (WORD)lf.lfWeight;
 		cf2.bPitchAndFamily = lf.lfPitchAndFamily;
@@ -1780,7 +1780,7 @@ void TSAPI DM_UpdateTitle(TWindowData *dat, WPARAM, LPARAM lParam)
 	if (dat->idle != dwOldIdle || lParam != 0) {
 		if (item.mask & TCIF_TEXT) {
 			item.pszText = newtitle;
-			mir_tstrncpy(dat->newtitle, newtitle, SIZEOF(dat->newtitle));
+			_tcsncpy(dat->newtitle, newtitle, SIZEOF(dat->newtitle));
 			dat->newtitle[127] = 0;
 			if (dat->pWnd)
 				dat->pWnd->updateTitle(dat->cache->getNick());
diff --git a/plugins/TabSRMM/src/msgdlgutils.cpp b/plugins/TabSRMM/src/msgdlgutils.cpp
index e3363eb1ae..9c642a0db2 100644
--- a/plugins/TabSRMM/src/msgdlgutils.cpp
+++ b/plugins/TabSRMM/src/msgdlgutils.cpp
@@ -989,11 +989,11 @@ BOOL TSAPI DoRtfToTags(const TWindowData *dat, CMString &pszText, int iNumColors
 					TCHAR tmp[10];

 

 					if (p[3] != ' ' && p[3] != '\\') {

-						mir_tstrncpy(tmp, p + 2, 3);

+						_tcsncpy(tmp, p + 2, 3);

 						tmp[3] = 0;

 					}

 					else {

-						mir_tstrncpy(tmp, p + 2, 2);

+						_tcsncpy(tmp, p + 2, 2);

 						tmp[2] = 0;

 					}

 

diff --git a/plugins/TabSRMM/src/msglog.cpp b/plugins/TabSRMM/src/msglog.cpp
index d32949d03f..67f7fb0733 100644
--- a/plugins/TabSRMM/src/msglog.cpp
+++ b/plugins/TabSRMM/src/msglog.cpp
@@ -133,8 +133,8 @@ void TSAPI CacheLogFonts()
 	}

 	mir_snprintf(rtfFontsGlobal[MSGDLGFONTCOUNT], SIZEOF(rtfFontsGlobal[MSGDLGFONTCOUNT]), "\\f%u\\cf%u\\b%d\\i%d\\fs%u", MSGDLGFONTCOUNT, MSGDLGFONTCOUNT, 0, 0, 0);

 

-	mir_tstrncpy(szToday, TranslateT("Today"), 20);

-	mir_tstrncpy(szYesterday, TranslateT("Yesterday"), 20);

+	_tcsncpy(szToday, TranslateT("Today"), 20);

+	_tcsncpy(szYesterday, TranslateT("Yesterday"), 20);

 	szToday[19] = szYesterday[19] = 0;

 

 	// cache/create the info panel fonts

diff --git a/plugins/TabSRMM/src/msgs.cpp b/plugins/TabSRMM/src/msgs.cpp
index 070771b799..5e83a533bc 100644
--- a/plugins/TabSRMM/src/msgs.cpp
+++ b/plugins/TabSRMM/src/msgs.cpp
@@ -787,7 +787,7 @@ static int TSAPI SetupIconLibConfig()
 	int j = 2, version = 0;

 

 	TCHAR szFilename[MAX_PATH];

-	mir_tstrncpy(szFilename, _T("icons\\tabsrmm_icons.dll"), MAX_PATH);

+	_tcsncpy(szFilename, _T("icons\\tabsrmm_icons.dll"), MAX_PATH);

 	g_hIconDLL = LoadLibrary(szFilename);

 	if (g_hIconDLL == 0) {

 		CWarning::show(CWarning::WARN_ICONPACKMISSING, CWarning::CWF_NOALLOWHIDE | MB_ICONERROR | MB_OK);

@@ -824,7 +824,7 @@ static int TSAPI SetupIconLibConfig()
 	sid.iDefaultIndex = -IDI_CLOCK;

 	Skin_AddIcon(&sid);

 

-	mir_tstrncpy(szFilename, _T("plugins\\tabsrmm.dll"), MAX_PATH);

+	_tcsncpy(szFilename, _T("plugins\\tabsrmm.dll"), MAX_PATH);

 

 	sid.pszName = "tabSRMM_overlay_disabled";

 	sid.pszDescription = LPGEN("Feature disabled (used as overlay)");

diff --git a/plugins/TabSRMM/src/selectcontainer.cpp b/plugins/TabSRMM/src/selectcontainer.cpp
index 6b34af57fe..41b7951151 100644
--- a/plugins/TabSRMM/src/selectcontainer.cpp
+++ b/plugins/TabSRMM/src/selectcontainer.cpp
@@ -128,7 +128,7 @@ INT_PTR CALLBACK SelectContainerDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, L
 						SendDlgItemMessage(hwndDlg, IDC_CNTLIST, LB_RESETCONTENT, 0, 0);

 						for (TContainerData *p = pFirstContainer; p; p = p->pNext) {

 							if (!_tcsncmp(p->szName, szName, CONTAINER_NAMELEN) && mir_tstrlen(p->szName) == mir_tstrlen(szName)) {

-								mir_tstrncpy(p->szName, szNewName, CONTAINER_NAMELEN);

+								_tcsncpy(p->szName, szNewName, CONTAINER_NAMELEN);

 								SendMessage(p->hwnd, DM_CONFIGURECONTAINER, 0, 0);

 							}

 						}

diff --git a/plugins/TabSRMM/src/sendlater.cpp b/plugins/TabSRMM/src/sendlater.cpp
index 0cb77c3e32..bcc649242e 100644
--- a/plugins/TabSRMM/src/sendlater.cpp
+++ b/plugins/TabSRMM/src/sendlater.cpp
@@ -325,14 +325,14 @@ int CSendLater::addJob(const char *szSetting, LPARAM lParam)
 

 	CSendLaterJob *job = new CSendLaterJob;

 

-	mir_strncpy(job->szId, szSetting, 20);

+	strncpy(job->szId, szSetting, 20);

 	job->szId[19] = 0;

 	job->hContact = hContact;

 	job->created = atol(&szSetting[1]);

 

 	size_t iLen = mir_strlen(szOrig_Utf);

 	job->sendBuffer = reinterpret_cast<char *>(mir_alloc(iLen + 1));

-	mir_strncpy(job->sendBuffer, szOrig_Utf, iLen);

+	strncpy(job->sendBuffer, szOrig_Utf, iLen);

 	job->sendBuffer[iLen] = 0;

 

 	// construct conventional send buffer

@@ -345,7 +345,7 @@ int CSendLater::addJob(const char *szSetting, LPARAM lParam)
 

 	job->pBuf = (PBYTE)mir_calloc(required);

 

-	mir_strncpy((char*)job->pBuf, szAnsi, iLen);

+	strncpy((char*)job->pBuf, szAnsi, iLen);

 	job->pBuf[iLen] = 0;

 	if (szWchar)

 		wcsncpy((wchar_t*)&job->pBuf[iLen + 1], szWchar, mir_wstrlen(szWchar));

diff --git a/plugins/TabSRMM/src/themes.cpp b/plugins/TabSRMM/src/themes.cpp
index 46280b0072..a0825801b6 100644
--- a/plugins/TabSRMM/src/themes.cpp
+++ b/plugins/TabSRMM/src/themes.cpp
@@ -817,7 +817,7 @@ TCHAR* CImageItem::Read(const TCHAR *szFilename)
 	GetPrivateProfileString(m_szName, _T("Image"), _T("None"), buffer, 500, szFilename);

 	if (mir_tstrcmp(buffer, _T("None")) || m_dwFlags & IMAGE_GLYPH) {

 		szFinalName = new TCHAR[MAX_PATH];

-		//mir_strncpy(m_szName, &m_szName[1], sizeof(m_szName));

+		//strncpy(m_szName, &m_szName[1], sizeof(m_szName));

 		//m_szName[sizeof(m_szName) - 1] = 0;

 		_tsplitpath(szFilename, szDrive, szPath, NULL, NULL);

 		mir_sntprintf(szFinalName, MAX_PATH, _T("%s\\%s%s"), szDrive, szPath, buffer);

diff --git a/plugins/TabSRMM/src/utils.cpp b/plugins/TabSRMM/src/utils.cpp
index a4bb0e2243..f8762db894 100644
--- a/plugins/TabSRMM/src/utils.cpp
+++ b/plugins/TabSRMM/src/utils.cpp
@@ -342,7 +342,7 @@ TCHAR* Utils::FormatTitleBar(const TWindowData *dat, const TCHAR *szFormat)
 				DBVARIANT dbv = { 0 };

 

 				if (!db_get_ts(dat->hContact, (char *)dat->szProto, "XStatusName", &dbv)) {

-					mir_tstrncpy(szTemp, dbv.ptszVal, 500);

+					_tcsncpy(szTemp, dbv.ptszVal, 500);

 					szTemp[500] = 0;

 					db_free(&dbv);

 					title.insert(tempmark + 2, szTemp);

@@ -363,7 +363,7 @@ TCHAR* Utils::FormatTitleBar(const TWindowData *dat, const TCHAR *szFormat)
 				DBVARIANT dbv = { 0 };

 

 				if (!db_get_ts(dat->hContact, (char *)dat->szProto, "XStatusName", &dbv)) {

-					mir_tstrncpy(szTemp, dbv.ptszVal, 500);

+					_tcsncpy(szTemp, dbv.ptszVal, 500);

 					szTemp[500] = 0;

 					db_free(&dbv);

 					title.insert(tempmark + 2, szTemp);