replace strncat to mir_strncat

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

27 files changed, 108 insertions, 108 deletions

diff --git a/plugins/Clist_nicer/src/extBackg.cpp b/plugins/Clist_nicer/src/extBackg.cpp
index 6466404b47..bf285973c1 100644
--- a/plugins/Clist_nicer/src/extBackg.cpp
+++ b/plugins/Clist_nicer/src/extBackg.cpp
@@ -290,7 +290,7 @@ void LoadExtBkSettingsFromDB()
 		mir_snprintf(p->szDBname, SIZEOF(p->szDBname), "EXBK_%s", accs[i]->szModuleName);

 		if (i == 0) {

 			mir_strncpy(p->szName, "{-}", SIZEOF(p->szName));

-			strncat(p->szName, accs[i]->szModuleName, SIZEOF(p->szName) - mir_strlen(p->szName));

+			mir_strncat(p->szName, accs[i]->szModuleName, SIZEOF(p->szName) - mir_strlen(p->szName));

 		}

 		else mir_strncpy(p->szName, accs[i]->szModuleName, SIZEOF(p->szName));

 		p->statusID = ID_EXTBK_LAST;

diff --git a/plugins/Clist_nicer/src/viewmodes.cpp b/plugins/Clist_nicer/src/viewmodes.cpp
index 5694204f0d..d3d6518959 100644
--- a/plugins/Clist_nicer/src/viewmodes.cpp
+++ b/plugins/Clist_nicer/src/viewmodes.cpp
@@ -345,8 +345,8 @@ void SaveState()
 				item.cchTextMax = SIZEOF(szTemp);

 				item.iItem = i;

 				SendMessageA(hwndList, LVM_GETITEMA, 0, (LPARAM)&item);

-				strncat(newProtoFilter, szTemp, SIZEOF(newProtoFilter) - mir_strlen(newProtoFilter));

-				strncat(newProtoFilter, "|", SIZEOF(newProtoFilter) - mir_strlen(newProtoFilter));

+				mir_strncat(newProtoFilter, szTemp, SIZEOF(newProtoFilter) - mir_strlen(newProtoFilter));

+				mir_strncat(newProtoFilter, "|", SIZEOF(newProtoFilter) - mir_strlen(newProtoFilter));

 				newProtoFilter[2047] = 0;

 			}

 		}

diff --git a/plugins/CmdLine/MimCmd/src/commands.cpp b/plugins/CmdLine/MimCmd/src/commands.cpp
index c644dd7cc6..2cbdfe7430 100644
--- a/plugins/CmdLine/MimCmd/src/commands.cpp
+++ b/plugins/CmdLine/MimCmd/src/commands.cpp
@@ -141,11 +141,11 @@ void HandleHelpCommand(PCommand helpCommand, char *argv[], int argc, PReply repl
 		

 		for (int i = 0; i < cKnownCommands - 1; i++)

 		{

-			strncat(reply->message, knownCommands[i].command, SIZEOF(reply->message) - mir_strlen(reply->message));

-			strncat(reply->message, ", ", SIZEOF(reply->message) - mir_strlen(reply->message));

+			mir_strncat(reply->message, knownCommands[i].command, SIZEOF(reply->message) - mir_strlen(reply->message));

+			mir_strncat(reply->message, ", ", SIZEOF(reply->message) - mir_strlen(reply->message));

 		}

-		strncat(reply->message, knownCommands[cKnownCommands - 1].command, SIZEOF(reply->message) - mir_strlen(reply->message));

-		strncat(reply->message, ".", SIZEOF(reply->message) - mir_strlen(reply->message));

+		mir_strncat(reply->message, knownCommands[cKnownCommands - 1].command, SIZEOF(reply->message) - mir_strlen(reply->message));

+		mir_strncat(reply->message, ".", SIZEOF(reply->message) - mir_strlen(reply->message));

 	}

 }

 

diff --git a/plugins/CmdLine/src/mimcmd_handlers.cpp b/plugins/CmdLine/src/mimcmd_handlers.cpp
index 70310a08b3..90c02c9d28 100644
--- a/plugins/CmdLine/src/mimcmd_handlers.cpp
+++ b/plugins/CmdLine/src/mimcmd_handlers.cpp
@@ -253,14 +253,14 @@ void HandleStatusCommand(PCommand command, TArgument *argv, int argc, PReply rep
 					INT_PTR status = CallProtoService(accounts[i]->szModuleName, PS_GETSTATUS, 0, 0);

 					PrettyStatusMode(status, pn, sizeof(pn));

 

-					strncat(perAccountStatus, "\n", cPerAccountStatus - mir_strlen(perAccountStatus));

+					mir_strncat(perAccountStatus, "\n", cPerAccountStatus - mir_strlen(perAccountStatus));

 

 					char *account = mir_u2a((wchar_t *) accounts[i]->tszAccountName);

-					strncat(perAccountStatus, account, cPerAccountStatus - mir_strlen(perAccountStatus));

+					mir_strncat(perAccountStatus, account, cPerAccountStatus - mir_strlen(perAccountStatus));

 					mir_free(account);

 

-					strncat(perAccountStatus, ": ", cPerAccountStatus - mir_strlen(perAccountStatus));

-					strncat(perAccountStatus, pn, cPerAccountStatus - mir_strlen(perAccountStatus));

+					mir_strncat(perAccountStatus, ": ", cPerAccountStatus - mir_strlen(perAccountStatus));

+					mir_strncat(perAccountStatus, pn, cPerAccountStatus - mir_strlen(perAccountStatus));

 				}

 			}

 

@@ -391,8 +391,8 @@ void HandleAwayMsgCommand(PCommand command, TArgument *argv, int argc, PReply re
 					

 					if (i != 0)

 					{

-						strncat(reply->message, "\n", reply->cMessage - mir_strlen(reply->message));

-						strncat(reply->message, buffer, reply->cMessage - mir_strlen(reply->message));

+						mir_strncat(reply->message, "\n", reply->cMessage - mir_strlen(reply->message));

+						mir_strncat(reply->message, buffer, reply->cMessage - mir_strlen(reply->message));

 					}

 					else{

 						STRNCPY(reply->message, buffer, reply->cMessage);

@@ -918,8 +918,8 @@ void HandleMessageCommand(PCommand command, TArgument *argv, int argc, PReply re
 				STRNCPY(reply->message, buffer, reply->cMessage);

 			}

 			else {

-				strncat(reply->message, "\n", reply->cMessage - mir_strlen(reply->message));

-				strncat(reply->message, buffer, reply->cMessage - mir_strlen(reply->message));

+				mir_strncat(reply->message, "\n", reply->cMessage - mir_strlen(reply->message));

+				mir_strncat(reply->message, buffer, reply->cMessage - mir_strlen(reply->message));

 			}

 		}

 	}

@@ -1287,8 +1287,8 @@ void HandleProtocolProxyCommand(PCommand command, TArgument *argv, int argc, PRe
 	

 	if (reply->message[0] != 0)

 	{

-		strncat(reply->message, "\n", reply->cMessage - mir_strlen(reply->message));

-		strncat(reply->message, buffer, reply->cMessage - mir_strlen(reply->message));

+		mir_strncat(reply->message, "\n", reply->cMessage - mir_strlen(reply->message));

+		mir_strncat(reply->message, buffer, reply->cMessage - mir_strlen(reply->message));

 		reply->message[reply->cMessage - 1] = 0;

 	}

 	else{

@@ -1455,8 +1455,8 @@ void HandleContactsCommand(PCommand command, TArgument *argv, int argc, PReply r
 					mir_snprintf(buffer, SIZEOF(buffer), "%s:[%s]:%s (%08d)", contact, id, protocol, hContact);

 					if (count)

 					{

-						strncat(reply->message, "\n", reply->cMessage - mir_strlen(reply->message));

-						strncat(reply->message, buffer, reply->cMessage - mir_strlen(reply->message));

+						mir_strncat(reply->message, "\n", reply->cMessage - mir_strlen(reply->message));

+						mir_strncat(reply->message, buffer, reply->cMessage - mir_strlen(reply->message));

 					}

 					else{

 						STRNCPY(reply->message, buffer, reply->cMessage);

@@ -1532,8 +1532,8 @@ void AddHistoryEvent(DBEVENTINFO *dbEvent, char *contact, PReply reply)
 	

 	if (reply->message[0] != 0)

 	{

-		strncat(reply->message, "\n", reply->cMessage - mir_strlen(reply->message));

-		strncat(reply->message, buffer, reply->cMessage - mir_strlen(reply->message));

+		mir_strncat(reply->message, "\n", reply->cMessage - mir_strlen(reply->message));

+		mir_strncat(reply->message, buffer, reply->cMessage - mir_strlen(reply->message));

 	}

 	else{

 		STRNCPY(reply->message, buffer, reply->cMessage);

@@ -1586,8 +1586,8 @@ void HandleHistoryCommand(PCommand command, TArgument *argv, int argc, PReply re
 							mir_snprintf(buffer, SIZEOF(buffer), Translate("%s:%s - %d unread events."), contact, protocol, count);

 

 							if (contacts > 0) {

-								strncat(reply->message, "\n", reply->cMessage - mir_strlen(reply->message));

-								strncat(reply->message, buffer, reply->cMessage - mir_strlen(reply->message));

+								mir_strncat(reply->message, "\n", reply->cMessage - mir_strlen(reply->message));

+								mir_strncat(reply->message, buffer, reply->cMessage - mir_strlen(reply->message));

 							}

 							else STRNCPY(reply->message, buffer, reply->cMessage);

 

diff --git a/plugins/DbEditorPP/src/findwindow.cpp b/plugins/DbEditorPP/src/findwindow.cpp
index 81bdbf880c..d05f2b8cef 100644
--- a/plugins/DbEditorPP/src/findwindow.cpp
+++ b/plugins/DbEditorPP/src/findwindow.cpp
@@ -247,7 +247,7 @@ char* multiReplace(const char* value, const char *find, const char *replace, int
 			temp = (char*)mir_realloc(temp, mir_strlen(temp) + mir_strlen(string) + replen + 1);

 			if (!temp) mir_tstrdup(value);

 

-			strncat(temp, string, (head - string));

+			mir_strncat(temp, string, (head - string));

 			string = head + len;

 			mir_strcat(temp, replace);

 

diff --git a/plugins/ExternalAPI/m_folders.h b/plugins/ExternalAPI/m_folders.h
index ae4930313b..271237e574 100644
--- a/plugins/ExternalAPI/m_folders.h
+++ b/plugins/ExternalAPI/m_folders.h
@@ -209,10 +209,10 @@ __inline static INT_PTR FoldersGetCustomPathEx(HANDLE hFolderEntry, char *path,
 	}

 

 	if (path[0] != '\0')

-		strncat(path, "\\", size - mir_strlen(path));

+		mir_strncat(path, "\\", size - mir_strlen(path));

 

 	if (fileName)

-		strncat(path, fileName, size - mir_strlen(path));

+		mir_strncat(path, fileName, size - mir_strlen(path));

 

 	return res;

 }

diff --git a/plugins/FloatingContacts/src/filedrop.cpp b/plugins/FloatingContacts/src/filedrop.cpp
index d23bf5696a..f53edeba5b 100644
--- a/plugins/FloatingContacts/src/filedrop.cpp
+++ b/plugins/FloatingContacts/src/filedrop.cpp
@@ -289,7 +289,7 @@ static void SaveFiles( char *szItem, char **ppFiles, int *pnCount )
 				if ( NULL != strstr( szFile, "*.*" ))

 				{

 					szFile[ mir_strlen( szFile ) - 3 ] = '\0';

-					strncat(szFile, fd.cFileName, nSize - mir_strlen(szFile));

+					mir_strncat(szFile, fd.cFileName, nSize - mir_strlen(szFile));

 				}

 								

 				ppFiles[ *pnCount ] = szFile;

diff --git a/plugins/HTTPServer/src/IndexHTML.cpp b/plugins/HTTPServer/src/IndexHTML.cpp
index 7df0e566fb..a2ae11602f 100644
--- a/plugins/HTTPServer/src/IndexHTML.cpp
+++ b/plugins/HTTPServer/src/IndexHTML.cpp
@@ -63,7 +63,7 @@ bool LoadIndexHTMLTemplate() {
 	char* pszDestBuf = szDestBuf;

 

 	strncpy(pszBuf, szPluginPath, SIZEOF(szBuf)-1);

-	strncat(pszBuf, szIndexHTMLTemplateFile, SIZEOF(szBuf) - mir_strlen(szBuf));

+	mir_strncat(pszBuf, szIndexHTMLTemplateFile, SIZEOF(szBuf) - mir_strlen(szBuf));

 

 	HANDLE hFile = CreateFile(pszBuf, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE,

 	    NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);

@@ -284,7 +284,7 @@ bool bCreateIndexHTML(const char * pszRealPath, const char * pszIndexPath,
 	// check if directory exists

 	char szMask[MAX_PATH];

 	strncpy(szMask, pszRealPath, MAX_PATH- 1);

-	strncat(szMask, "*", SIZEOF(szMask) - mir_strlen(szMask));

+	mir_strncat(szMask, "*", SIZEOF(szMask) - mir_strlen(szMask));

 

 	WIN32_FIND_DATAA fdFindFileData;

 	HANDLE hFind = FindFirstFile(szMask, &fdFindFileData);

diff --git a/plugins/HTTPServer/src/IndexXML.cpp b/plugins/HTTPServer/src/IndexXML.cpp
index 782cb289e2..7de9c2cc8b 100644
--- a/plugins/HTTPServer/src/IndexXML.cpp
+++ b/plugins/HTTPServer/src/IndexXML.cpp
@@ -65,7 +65,7 @@ bool bCreateIndexXML(const char * pszRealPath, const char * pszIndexPath,
 										 const char * pszSrvPath, DWORD dwRemoteIP) {

 	char szMask[MAX_PATH+1];

 	strncpy(szMask, pszRealPath, MAX_PATH);

-	strncat(szMask, "*", SIZEOF(szMask) - mir_strlen(szMask));

+	mir_strncat(szMask, "*", SIZEOF(szMask) - mir_strlen(szMask));

 

 	WIN32_FIND_DATAA fdFindFileData;

 	HANDLE hFind = FindFirstFile(szMask, &fdFindFileData);

@@ -103,7 +103,7 @@ bool bCreateIndexXML(const char * pszRealPath, const char * pszIndexPath,
 

 	// check if a index.xsl exists in the same directory otherwise use the global

 	strncpy(szMask, pszRealPath, MAX_PATH);

-	strncat(szMask, "index.xsl", SIZEOF(szMask) - mir_strlen(szMask));

+	mir_strncat(szMask, "index.xsl", SIZEOF(szMask) - mir_strlen(szMask));

 

 	HANDLE hFileExists = CreateFile(szMask, GENERIC_READ, 

 		FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 

diff --git a/plugins/IEView/src/HistoryHTMLBuilder.cpp b/plugins/IEView/src/HistoryHTMLBuilder.cpp
index 6fb213544a..03c083eaef 100644
--- a/plugins/IEView/src/HistoryHTMLBuilder.cpp
+++ b/plugins/IEView/src/HistoryHTMLBuilder.cpp
@@ -89,7 +89,7 @@ char *HistoryHTMLBuilder::timestampToString(time_t check)
 	szResult[0] = '\0';

 	dbtts.szFormat = (char *)"d t";

 	CallService(MS_DB_TIME_TIMESTAMPTOSTRING, check, (LPARAM)& dbtts);

-	strncat(szResult, str, SIZEOF(szResult) - mir_strlen(szResult));

+	mir_strncat(szResult, str, SIZEOF(szResult) - mir_strlen(szResult));

 	mir_strncpy(szResult, ptrA(mir_utf8encode(szResult)), 500);

 	return szResult;

 }

diff --git a/plugins/IEView/src/MUCCHTMLBuilder.cpp b/plugins/IEView/src/MUCCHTMLBuilder.cpp
index 8059b9f9fe..dc34b47dca 100644
--- a/plugins/IEView/src/MUCCHTMLBuilder.cpp
+++ b/plugins/IEView/src/MUCCHTMLBuilder.cpp
@@ -114,7 +114,7 @@ char *MUCCHTMLBuilder::timestampToString(DWORD dwData, time_t check)
 		dbtts.szFormat = (char *)"";

 	}

 	CallService(MS_DB_TIME_TIMESTAMPTOSTRING, check, (LPARAM)& dbtts);

-	strncat(szResult, str, SIZEOF(szResult) - mir_strlen(szResult));

+	mir_strncat(szResult, str, SIZEOF(szResult) - mir_strlen(szResult));

 	mir_strncpy(szResult, ptrA(mir_utf8encode(szResult)), 500);

 	return szResult;

 }

diff --git a/plugins/IEView/src/ScriverHTMLBuilder.cpp b/plugins/IEView/src/ScriverHTMLBuilder.cpp
index b876e8e1c8..fec5fa0aaf 100644
--- a/plugins/IEView/src/ScriverHTMLBuilder.cpp
+++ b/plugins/IEView/src/ScriverHTMLBuilder.cpp
@@ -172,7 +172,7 @@ char *ScriverHTMLBuilder::timestampToString(DWORD dwFlags, time_t check, int mod
 		//		CallService(MS_DB_TIME_TIMESTAMPTOSTRINGT, check, (LPARAM) & dbtts);

 		CallService(MS_DB_TIME_TIMESTAMPTOSTRING, check, (LPARAM)& dbtts);

 		//_tcsncat(szResult, str, 500);

-		strncat(szResult, str, SIZEOF(szResult) - mir_strlen(szResult));

+		mir_strncat(szResult, str, SIZEOF(szResult) - mir_strlen(szResult));

 	}

 	mir_strncpy(szResult, ptrA(mir_utf8encode(szResult)), 500);

 	return szResult;

diff --git a/plugins/IEView/src/TabSRMMHTMLBuilder.cpp b/plugins/IEView/src/TabSRMMHTMLBuilder.cpp
index 6972490e9e..d64d1851d7 100644
--- a/plugins/IEView/src/TabSRMMHTMLBuilder.cpp
+++ b/plugins/IEView/src/TabSRMMHTMLBuilder.cpp
@@ -194,7 +194,7 @@ char* TabSRMMHTMLBuilder::timestampToString(DWORD dwFlags, time_t check, int isG
 		}

 	}

 	CallService(MS_DB_TIME_TIMESTAMPTOSTRING, check, (LPARAM)& dbtts);

-	strncat(szResult, str, SIZEOF(szResult) - mir_strlen(szResult));

+	mir_strncat(szResult, str, SIZEOF(szResult) - mir_strlen(szResult));

 	mir_strncpy(szResult, ptrA(mir_utf8encode(szResult)), 500);

 	return szResult;

 }

diff --git a/plugins/IEView/src/TemplateHTMLBuilder.cpp b/plugins/IEView/src/TemplateHTMLBuilder.cpp
index 9904272509..e63cfd2203 100644
--- a/plugins/IEView/src/TemplateHTMLBuilder.cpp
+++ b/plugins/IEView/src/TemplateHTMLBuilder.cpp
@@ -176,7 +176,7 @@ void TemplateHTMLBuilder::buildHeadTemplate(IEView *view, IEVIEWEVENT *event, Pr
 		return;

 

 	mir_strcpy(tempBase, "file://");

-	strncat(tempBase, tmpm->getFilename(), SIZEOF(tempBase) - mir_strlen(tempBase));

+	mir_strncat(tempBase, tmpm->getFilename(), SIZEOF(tempBase) - mir_strlen(tempBase));

 	char *pathrun = tempBase + mir_strlen(tempBase);

 	while ((*pathrun != '\\' && *pathrun != '/') && (pathrun > tempBase))

 		pathrun--;

diff --git a/plugins/MirOTR/src/dbfilter.cpp b/plugins/MirOTR/src/dbfilter.cpp
index fa65dd8ddc..b3078c0c8d 100644
--- a/plugins/MirOTR/src/dbfilter.cpp
+++ b/plugins/MirOTR/src/dbfilter.cpp
@@ -91,7 +91,7 @@ int OnDatabaseEventPreAdd(WPARAM hContact, LPARAM lParam)
 		newmsg = (char*)mir_alloc(alloclen);
 		memset(newmsg, 0, alloclen+datalen);
 		strncpy(newmsg, options.prefix, prefixlen);
-		strncat(newmsg, msg, alloclen - mir_strlen(newmsg));
+		mir_strncat(newmsg, msg, alloclen - mir_strlen(newmsg));
 		// append additional data
 		if (datalen) {
 				memcpy(newmsg+alloclen, msg+len2, datalen);
@@ -130,7 +130,7 @@ int OnDatabaseEventPreAdd(WPARAM hContact, LPARAM lParam)
 			newmsg = (char*)mir_alloc(alloclen+datalen);
 			memset(newmsg, 0, alloclen+datalen);
 			strncpy(newmsg, prefix, prefixlen);
-			strncat(newmsg, msg, alloclen + datalen - mir_strlen(newmsg));
+			mir_strncat(newmsg, msg, alloclen + datalen - mir_strlen(newmsg));
 			wchar_t *p = (wchar_t*) newmsg + (msglen + prefixlen + 1);
 			wcsncpy(p, prefixw, prefixlenw);
 			wcsncat(p, msgw, msglenw - mir_wstrlen(p));
@@ -158,7 +158,7 @@ int OnDatabaseEventPreAdd(WPARAM hContact, LPARAM lParam)
 			newmsg = (char*)mir_alloc(alloclen+datalen);
 			memset(newmsg, 0, alloclen+datalen);
 			strncpy(newmsg, prefix, prefixlen);
-			strncat(newmsg, msg, msglen - mir_strlen(newmsg));
+			mir_strncat(newmsg, msg, msglen - mir_strlen(newmsg));
 			mir_free(prefix);
 			// append additional data
 			if (datalen) {
diff --git a/plugins/Non-IM Contact/src/contactinfo.cpp b/plugins/Non-IM Contact/src/contactinfo.cpp
index ea085b986c..3b037b3159 100644
--- a/plugins/Non-IM Contact/src/contactinfo.cpp
+++ b/plugins/Non-IM Contact/src/contactinfo.cpp
@@ -280,7 +280,7 @@ char* copyReplaceString(char* oldStr, char* newStr, char* findStr, char* replace
 			i += (int)mir_strlen(findStr);

 		}

 		else {

-			strncat(newStr, &oldStr[i], 1);

+			mir_strncat(newStr, &oldStr[i], 1);

 			i++;

 		}

 	}

@@ -536,7 +536,7 @@ INT_PTR ImportContacts(WPARAM wParam, LPARAM lParam)
 				fgets(line, 2000, file);

 			}

 			// the line that has the </tooltip>

-			strncat(tooltip, line, SIZEOF(tooltip) - mir_strlen(tooltip));

+			mir_strncat(tooltip, line, SIZEOF(tooltip) - mir_strlen(tooltip));

 		}

 		else if (!strncmp(line, "Icon=", mir_strlen("Icon="))) {

 			i = (int)mir_strlen("Icon=");

diff --git a/plugins/Non-IM Contact/src/namereplacing.cpp b/plugins/Non-IM Contact/src/namereplacing.cpp
index a1737b6eda..3028cf5f2c 100644
--- a/plugins/Non-IM Contact/src/namereplacing.cpp
+++ b/plugins/Non-IM Contact/src/namereplacing.cpp
@@ -223,10 +223,10 @@ void checkStringForcompare(char *str)
 					mir_strcat(newStr, X);

 				else mir_strcat(newStr, Y);

 			}

-			else strncat(newStr, &str[i], j);

+			else mir_strncat(newStr, &str[i], j);

 			i += j;

 		}

-		else strncat(newStr, &str[i], 1);

+		else mir_strncat(newStr, &str[i], 1);

 	}

 	mir_strcpy(str, newStr);

 	free(newStr);

@@ -249,10 +249,10 @@ void checkStringForSave(MCONTACT hContact, char* str)
 			if (A && B)

 				db_set_s(hContact, MODNAME, A, B);

 

-			else strncat(newStr, &str[i], j);

+			else mir_strncat(newStr, &str[i], j);

 			i += j;

 		}

-		else strncat(newStr, &str[i], 1);

+		else mir_strncat(newStr, &str[i], 1);

 	}

 	mir_strcpy(str, newStr);

 	free(newStr);

@@ -278,10 +278,10 @@ void checkStringForLoad(MCONTACT hContact, char* str)
 					db_free(&dbv);

 				}

 			}

-			else strncat(newStr, &str[i], j);

+			else mir_strncat(newStr, &str[i], j);

 			i += j;

 		}

-		else strncat(newStr, &str[i], 1);

+		else mir_strncat(newStr, &str[i], 1);

 	}

 	mir_strcpy(str, newStr);

 	free(newStr);

@@ -323,10 +323,10 @@ void checkStringForSaveN(char* str)
 					break;

 				}

 			}

-			else strncat(newStr, &str[i], j);

+			else mir_strncat(newStr, &str[i], j);

 			i += j;

 		}

-		else strncat(newStr, &str[i], 1);

+		else mir_strncat(newStr, &str[i], 1);

 	}

 	mir_strcpy(str, newStr);

 	free(newStr);

@@ -366,10 +366,10 @@ void checkStringForLoadN(char* str)
 					db_free(&dbv);

 				}

 			}

-			else strncat(newStr, &str[i], i);

+			else mir_strncat(newStr, &str[i], i);

 			i += j;

 		}

-		else strncat(newStr, &str[i], 1);

+		else mir_strncat(newStr, &str[i], 1);

 	}

 	mir_strcpy(str, newStr);

 	free(newStr);

@@ -524,7 +524,7 @@ int stringReplacer(const char* oldString, char* newString, MCONTACT hContact)
 			else {

 				// only copying from 1 line

 				if (startLine == endLine)

-					strncat(newString, &fileContents[startLine][startChar], endChar - startChar);

+					mir_strncat(newString, &fileContents[startLine][startChar], endChar - startChar);

 				else {

 					int i;

 					// copy the whole first line from startChar

@@ -534,7 +534,7 @@ int stringReplacer(const char* oldString, char* newString, MCONTACT hContact)
 						mir_strcat(newString, fileContents[i]);

 					}

 					// copy the last line untill endChar

-					strncat(newString, fileContents[endLine], endChar);

+					mir_strncat(newString, fileContents[endLine], endChar);

 				}

 			}

 		}

@@ -558,7 +558,7 @@ int stringReplacer(const char* oldString, char* newString, MCONTACT hContact)
 			positionInOldString += lastChecked(newString, &oldString[positionInOldString]);

 		}

 		else {

-			strncat(newString, &oldString[positionInOldString], 1);

+			mir_strncat(newString, &oldString[positionInOldString], 1);

 			positionInOldString++;

 		}

 	}

diff --git a/plugins/SecureIM/src/crypt_lists.cpp b/plugins/SecureIM/src/crypt_lists.cpp
index 40204b4789..28557fd1af 100644
--- a/plugins/SecureIM/src/crypt_lists.cpp
+++ b/plugins/SecureIM/src/crypt_lists.cpp
@@ -30,7 +30,7 @@ void loadSupportedProtocols()
 		SupPro *p = (SupPro*)mir_calloc(sizeof(SupPro));

 		p->name = mir_strdup(protos[i]->szModuleName);

 		if (szNames && p->name) {

-			char tmp[128]; strncpy(tmp, p->name, sizeof(tmp) - 1); strncat(tmp, ":", SIZEOF(tmp) - mir_strlen(tmp));

+			char tmp[128]; strncpy(tmp, p->name, sizeof(tmp) - 1); mir_strncat(tmp, ":", SIZEOF(tmp) - mir_strlen(tmp));

 			LPSTR szName = strstr(szNames, tmp);

 			if (szName) {

 				szName = strchr(szName, ':');

diff --git a/plugins/YahooGroups/src/services.cpp b/plugins/YahooGroups/src/services.cpp
index 75b4e8f75f..a5a0b01cfd 100644
--- a/plugins/YahooGroups/src/services.cpp
+++ b/plugins/YahooGroups/src/services.cpp
@@ -126,8 +126,8 @@ void CreateGroup(char *group)
 		*p = 0;

 		if (mir_strlen(buffer) > 0)

 		{

-			strncat(buffer, "\\", SIZEOF(buffer) - mir_strlen(buffer));

-			strncat(buffer, sub, SIZEOF(buffer) - mir_strlen(buffer));

+			mir_strncat(buffer, "\\", SIZEOF(buffer) - mir_strlen(buffer));

+			mir_strncat(buffer, sub, SIZEOF(buffer) - mir_strlen(buffer));

 		}

 		else{

 			strncpy_s(buffer, sub, _TRUNCATE);

@@ -146,8 +146,8 @@ void CreateGroup(char *group)
 	{

 		if (mir_strlen(buffer) > 0)

 		{

-			strncat(buffer, "\\", SIZEOF(buffer) - mir_strlen(buffer));

-			strncat(buffer, sub, SIZEOF(buffer) - mir_strlen(buffer));

+			mir_strncat(buffer, "\\", SIZEOF(buffer) - mir_strlen(buffer));

+			mir_strncat(buffer, sub, SIZEOF(buffer) - mir_strlen(buffer));

 		}

 		else{

 			strncpy_s(buffer, sub, _TRUNCATE);

diff --git a/protocols/Gadu-Gadu/src/filetransfer.cpp b/protocols/Gadu-Gadu/src/filetransfer.cpp
index 7cf7f5f319..3d23d0a9a5 100644
--- a/protocols/Gadu-Gadu/src/filetransfer.cpp
+++ b/protocols/Gadu-Gadu/src/filetransfer.cpp
@@ -270,7 +270,7 @@ void __cdecl GGPROTO::dccmainthread(void*)
 								PROTOFILETRANSFERSTATUS pfts;

 								local_dcc->tick = tick;

 								strncpy(filename, local_dcc->folder, sizeof(filename));

-								strncat(filename, (char*)local_dcc->file_info.filename, sizeof(filename) - mir_strlen(filename));

+								mir_strncat(filename, (char*)local_dcc->file_info.filename, sizeof(filename) - mir_strlen(filename));

 								memset(&pfts, 0, sizeof(PROTOFILETRANSFERSTATUS));

 								pfts.cbSize = sizeof(PROTOFILETRANSFERSTATUS);

 								pfts.hContact = (MCONTACT)local_dcc->contact;

@@ -301,7 +301,7 @@ void __cdecl GGPROTO::dccmainthread(void*)
 							{

 								PROTOFILETRANSFERSTATUS pfts;

 								strncpy(filename, local_dcc->folder, sizeof(filename));

-								strncat(filename, (char*)local_dcc->file_info.filename, sizeof(filename) - mir_strlen(filename));

+								mir_strncat(filename, (char*)local_dcc->file_info.filename, sizeof(filename) - mir_strlen(filename));

 								memset(&pfts, 0, sizeof(PROTOFILETRANSFERSTATUS));

 								pfts.cbSize = sizeof(PROTOFILETRANSFERSTATUS);

 								pfts.hContact = (MCONTACT)local_dcc->contact;

@@ -500,7 +500,7 @@ void __cdecl GGPROTO::dccmainthread(void*)
 								PROTOFILETRANSFERSTATUS pfts;

 								local_dcc7->tick = tick;

 								strncpy(filename, local_dcc7->folder, sizeof(filename));

-								strncat(filename, (char*)local_dcc7->filename, sizeof(filename) - mir_strlen(filename));

+								mir_strncat(filename, (char*)local_dcc7->filename, sizeof(filename) - mir_strlen(filename));

 								memset(&pfts, 0, sizeof(PROTOFILETRANSFERSTATUS));

 								pfts.cbSize = sizeof(PROTOFILETRANSFERSTATUS);

 								pfts.hContact = (MCONTACT)local_dcc7->contact;

@@ -531,7 +531,7 @@ void __cdecl GGPROTO::dccmainthread(void*)
 							{

 								PROTOFILETRANSFERSTATUS pfts;

 								strncpy(filename, local_dcc7->folder, sizeof(filename));

-								strncat(filename, (char*)local_dcc7->filename, sizeof(filename) - mir_strlen(filename));

+								mir_strncat(filename, (char*)local_dcc7->filename, sizeof(filename) - mir_strlen(filename));

 								memset(&pfts, 0, sizeof(PROTOFILETRANSFERSTATUS));

 								pfts.cbSize = sizeof(PROTOFILETRANSFERSTATUS);

 								pfts.hContact = (MCONTACT)local_dcc7->contact;

@@ -667,7 +667,7 @@ HANDLE GGPROTO::dccfileallow(HANDLE hTransfer, const PROTOCHAR* szPath)
 	struct gg_dcc *dcc = (struct gg_dcc *) hTransfer;

 	char fileName[MAX_PATH], *path = mir_t2a(szPath);

 	strncpy(fileName, path, sizeof(fileName));

-	strncat(fileName, (char*)dcc->file_info.filename, sizeof(fileName) - mir_strlen(fileName));

+	mir_strncat(fileName, (char*)dcc->file_info.filename, sizeof(fileName) - mir_strlen(fileName));

 	dcc->folder = _strdup((char *) path);

 	dcc->tick = 0;

 	mir_free(path);

@@ -709,7 +709,7 @@ HANDLE GGPROTO::dcc7fileallow(HANDLE hTransfer, const PROTOCHAR* szPath)
 	char fileName[MAX_PATH], *path = mir_t2a(szPath);

 	int iFtRemoveRes;

 	strncpy(fileName, path, sizeof(fileName));

-	strncat(fileName, (char*)dcc7->filename, sizeof(fileName) - mir_strlen(fileName));

+	mir_strncat(fileName, (char*)dcc7->filename, sizeof(fileName) - mir_strlen(fileName));

 	dcc7->folder = _strdup((char *) path);

 	dcc7->tick = 0;

 	mir_free(path);

diff --git a/protocols/Gadu-Gadu/src/gg_proto.cpp b/protocols/Gadu-Gadu/src/gg_proto.cpp
index 2b6d0db04a..34f27f4514 100644
--- a/protocols/Gadu-Gadu/src/gg_proto.cpp
+++ b/protocols/Gadu-Gadu/src/gg_proto.cpp
@@ -328,25 +328,25 @@ HANDLE GGPROTO::SearchByName(const PROTOCHAR *nick, const PROTOCHAR *firstName,
 	{

 		T2Utf nick_utf8(nick);

 		gg_pubdir50_add(req, GG_PUBDIR50_NICKNAME, nick_utf8);

-		strncat(data, nick_utf8, sizeof(data) - mir_strlen(data));

+		mir_strncat(data, nick_utf8, sizeof(data) - mir_strlen(data));

 	}

-	strncat(data, ".", sizeof(data) - mir_strlen(data));

+	mir_strncat(data, ".", sizeof(data) - mir_strlen(data));

 

 	if (firstName)

 	{

 		T2Utf firstName_utf8(firstName);

 		gg_pubdir50_add(req, GG_PUBDIR50_FIRSTNAME, firstName_utf8);

-		strncat(data, firstName_utf8, sizeof(data) - mir_strlen(data));

+		mir_strncat(data, firstName_utf8, sizeof(data) - mir_strlen(data));

 	}

-	strncat(data, ".", sizeof(data) - mir_strlen(data));

+	mir_strncat(data, ".", sizeof(data) - mir_strlen(data));

 

 	if (lastName)

 	{

 		T2Utf lastName_utf8(lastName);

 		gg_pubdir50_add(req, GG_PUBDIR50_LASTNAME, lastName_utf8);

-		strncat(data, lastName_utf8, sizeof(data) - mir_strlen(data));

+		mir_strncat(data, lastName_utf8, sizeof(data) - mir_strlen(data));

 	}

-	strncat(data, ".", sizeof(data) - mir_strlen(data));

+	mir_strncat(data, ".", sizeof(data) - mir_strlen(data));

 

 	// Count crc & check if the data was equal if yes do same search with shift

 	crc = crc_get(data);

@@ -402,36 +402,36 @@ HWND GGPROTO::SearchAdvanced(HWND hwndDlg)
 	{

 		T2Utf firstName_utf8(text);

 		gg_pubdir50_add(req, GG_PUBDIR50_FIRSTNAME, firstName_utf8);

-		strncat(data, firstName_utf8, sizeof(data) - mir_strlen(data));

+		mir_strncat(data, firstName_utf8, sizeof(data) - mir_strlen(data));

 	}

-	/* 1 */ strncat(data, ".", sizeof(data) - mir_strlen(data));

+	/* 1 */ mir_strncat(data, ".", sizeof(data) - mir_strlen(data));

 

 	GetDlgItemText(hwndDlg, IDC_LASTNAME, text, SIZEOF(text));

 	if (mir_tstrlen(text))

 	{

 		T2Utf lastName_utf8(text);

 		gg_pubdir50_add(req, GG_PUBDIR50_LASTNAME, lastName_utf8);

-		strncat(data, lastName_utf8, sizeof(data) - mir_strlen(data));

+		mir_strncat(data, lastName_utf8, sizeof(data) - mir_strlen(data));

 	}

-	/* 2 */ strncat(data, ".", sizeof(data) - mir_strlen(data));

+	/* 2 */ mir_strncat(data, ".", sizeof(data) - mir_strlen(data));

 

 	GetDlgItemText(hwndDlg, IDC_NICKNAME, text, SIZEOF(text));

 	if (mir_tstrlen(text))

 	{

 		T2Utf nickName_utf8(text);

 		gg_pubdir50_add(req, GG_PUBDIR50_NICKNAME, nickName_utf8);

-		strncat(data, nickName_utf8, sizeof(data) - mir_strlen(data));

+		mir_strncat(data, nickName_utf8, sizeof(data) - mir_strlen(data));

 	}

-	/* 3 */ strncat(data, ".", sizeof(data) - mir_strlen(data));

+	/* 3 */ mir_strncat(data, ".", sizeof(data) - mir_strlen(data));

 

 	GetDlgItemText(hwndDlg, IDC_CITY, text, SIZEOF(text));

 	if (mir_tstrlen(text))

 	{

 		T2Utf city_utf8(text);

 		gg_pubdir50_add(req, GG_PUBDIR50_CITY, city_utf8);

-		strncat(data, city_utf8, sizeof(data) - mir_strlen(data));

+		mir_strncat(data, city_utf8, sizeof(data) - mir_strlen(data));

 	}

-	/* 4 */ strncat(data, ".", sizeof(data) - mir_strlen(data));

+	/* 4 */ mir_strncat(data, ".", sizeof(data) - mir_strlen(data));

 

 	GetDlgItemText(hwndDlg, IDC_AGEFROM, text, SIZEOF(text));

 	if (mir_tstrlen(text))

@@ -459,29 +459,29 @@ HWND GGPROTO::SearchAdvanced(HWND hwndDlg)
 

 		T2Utf age_utf8(text);

 		gg_pubdir50_add(req, GG_PUBDIR50_BIRTHYEAR, age_utf8);

-		strncat(data, age_utf8, sizeof(data) - mir_strlen(data));

+		mir_strncat(data, age_utf8, sizeof(data) - mir_strlen(data));

 	}

-	/* 5 */ strncat(data, ".", sizeof(data) - mir_strlen(data));

+	/* 5 */ mir_strncat(data, ".", sizeof(data) - mir_strlen(data));

 

 	switch(SendDlgItemMessage(hwndDlg, IDC_GENDER, CB_GETCURSEL, 0, 0))

 	{

 		case 1:

 			gg_pubdir50_add(req, GG_PUBDIR50_GENDER, GG_PUBDIR50_GENDER_FEMALE);

-			strncat(data, GG_PUBDIR50_GENDER_MALE, sizeof(data) - mir_strlen(data));

+			mir_strncat(data, GG_PUBDIR50_GENDER_MALE, sizeof(data) - mir_strlen(data));

 			break;

 		case 2:

 			gg_pubdir50_add(req, GG_PUBDIR50_GENDER, GG_PUBDIR50_GENDER_MALE);

-			strncat(data, GG_PUBDIR50_GENDER_FEMALE, sizeof(data) - mir_strlen(data));

+			mir_strncat(data, GG_PUBDIR50_GENDER_FEMALE, sizeof(data) - mir_strlen(data));

 			break;

 	}

-	/* 6 */ strncat(data, ".", sizeof(data) - mir_strlen(data));

+	/* 6 */ mir_strncat(data, ".", sizeof(data) - mir_strlen(data));

 

 	if (IsDlgButtonChecked(hwndDlg, IDC_ONLYCONNECTED))

 	{

 		gg_pubdir50_add(req, GG_PUBDIR50_ACTIVE, GG_PUBDIR50_ACTIVE_TRUE);

-		strncat(data, GG_PUBDIR50_ACTIVE_TRUE, sizeof(data) - mir_strlen(data));

+		mir_strncat(data, GG_PUBDIR50_ACTIVE_TRUE, sizeof(data) - mir_strlen(data));

 	}

-	/* 7 */ strncat(data, ".", sizeof(data) - mir_strlen(data));

+	/* 7 */ mir_strncat(data, ".", sizeof(data) - mir_strlen(data));

 

 	// No data entered

 	if (mir_strlen(data) <= 7 || (mir_strlen(data) == 8 && IsDlgButtonChecked(hwndDlg, IDC_ONLYCONNECTED))) return (HWND)0;

diff --git a/protocols/Gadu-Gadu/src/oauth.cpp b/protocols/Gadu-Gadu/src/oauth.cpp
index f949bd7479..7990753277 100644
--- a/protocols/Gadu-Gadu/src/oauth.cpp
+++ b/protocols/Gadu-Gadu/src/oauth.cpp
@@ -228,7 +228,7 @@ char *oauth_generate_nonce()
 	int strSizeB = int(mir_strlen(timestamp) + sizeof(randnum));

 	ptrA str((char *)mir_calloc(strSizeB + 1));

 	mir_strcpy(str, timestamp);

-	strncat(str, randnum, sizeof(randnum));

+	mir_strncat(str, randnum, sizeof(randnum));

 

 	BYTE digest[16];

 	mir_md5_hash((BYTE*)(char*)str, strSizeB, digest);

diff --git a/protocols/Gadu-Gadu/src/services.cpp b/protocols/Gadu-Gadu/src/services.cpp
index af998847a4..d0f442d872 100644
--- a/protocols/Gadu-Gadu/src/services.cpp
+++ b/protocols/Gadu-Gadu/src/services.cpp
@@ -43,7 +43,7 @@ char *gg_status2db(int status, const char *suffix)
 		default: return NULL;

 	}

 	strncpy(str, prefix, sizeof(str));

-	strncat(str, suffix, sizeof(str) - mir_strlen(str));

+	mir_strncat(str, suffix, sizeof(str) - mir_strlen(str));

 	return str;

 }

 

diff --git a/protocols/IcqOscarJ/src/icq_clients.cpp b/protocols/IcqOscarJ/src/icq_clients.cpp
index 79f6e6d9e9..275dce0f04 100644
--- a/protocols/IcqOscarJ/src/icq_clients.cpp
+++ b/protocols/IcqOscarJ/src/icq_clients.cpp
@@ -514,12 +514,12 @@ const char* CIcqProto::detectUserClient(
 		}

 		else if (capId = MatchCapability(caps, wLen, &capmChat, 0xA)) {

 			mir_strcpy(szClientBuf, "mChat ");

-			strncat(szClientBuf, (char*)(*capId) + 0xA, 6);

+			mir_strncat(szClientBuf, (char*)(*capId) + 0xA, 6);

 			szClient = szClientBuf;

 		}

 		else if (capId = MatchCapability(caps, wLen, &capJimm, 5)) {

 			mir_strcpy(szClientBuf, "Jimm ");

-			strncat(szClientBuf, (char*)(*capId) + 5, 11);

+			mir_strncat(szClientBuf, (char*)(*capId) + 5, 11);

 			szClient = szClientBuf;

 		}

 		// http://corepager.net.ru/index/0-2

@@ -538,7 +538,7 @@ const char* CIcqProto::detectUserClient(
 		// http://darkjimm.ucoz.ru/

 		else if (capId = MatchCapability(caps, wLen, &capDiChat, 9)) {

 			mir_strcpy(szClientBuf, "D[i]Chat");

-			strncat(szClientBuf, (char*)(*capId) + 8, 8);

+			mir_strncat(szClientBuf, (char*)(*capId) + 8, 8);

 			szClient = szClientBuf;

 		}

 		else if (MatchCapability(caps, wLen, &capMacIcq))

@@ -569,31 +569,31 @@ const char* CIcqProto::detectUserClient(
 				makeClientVersion(szClientBuf, "MIP ", ver1, ver2, ver3, ver4);

 			else {

 				mir_strcpy(szClientBuf, "MIP ");

-				strncat(szClientBuf, (char*)(*capId) + 11, 5);

+				mir_strncat(szClientBuf, (char*)(*capId) + 11, 5);

 			}

 			szClient = szClientBuf;

 		}

 		//http://mip.rufon.net - new signature

 		else if (capId = MatchCapability(caps, wLen, &capMipClient, 0x04)) {

 			mir_strcpy(szClientBuf, "MIP ");

-			strncat(szClientBuf, (char*)(*capId) + 4, 12);

+			mir_strncat(szClientBuf, (char*)(*capId) + 4, 12);

 			szClient = szClientBuf;

 		}

 		else if (capId = MatchCapability(caps, wLen, &capVmIcq, 0x06)) {

 			mir_strcpy(szClientBuf, "VmICQ");

-			strncat(szClientBuf, (char*)(*capId) + 5, 11);

+			mir_strncat(szClientBuf, (char*)(*capId) + 5, 11);

 			szClient = szClientBuf;

 		}

 		// http://www.smape.com/smaper

 		else if (capId = MatchCapability(caps, wLen, &capSmapeR, 0x07)) {

 			mir_strcpy(szClientBuf, "SmapeR");

-			strncat(szClientBuf, (char*)(*capId) + 6, 10);

+			mir_strncat(szClientBuf, (char*)(*capId) + 6, 10);

 			szClient = szClientBuf;

 		}

 		// http://yapp.ru

 		else if (capId = MatchCapability(caps, wLen, &capYapp, 0x04)) {

 			mir_strcpy(szClientBuf, "Yapp! v");

-			strncat(szClientBuf, (char*)(*capId) + 8, 5);

+			mir_strncat(szClientBuf, (char*)(*capId) + 8, 5);

 			szClient = szClientBuf;

 		}

 		// http://www.dibsby.com (newer builds)

@@ -640,7 +640,7 @@ const char* CIcqProto::detectUserClient(
 		// http://www.barobin.com/bayanICQ.html

 		else if (capId = MatchCapability(caps, wLen, &capBayan, 8)) {

 			mir_strcpy(szClientBuf, "bayanICQ ");

-			strncat(szClientBuf, (char*)(*capId) + 8, 5);

+			mir_strncat(szClientBuf, (char*)(*capId) + 8, 5);

 			szClient = szClientBuf;

 		}

 		else if (capId = MatchCapability(caps, wLen, &capJabberJIT, 0x04))

diff --git a/protocols/Twitter/src/ui.cpp b/protocols/Twitter/src/ui.cpp
index 00ed1aab76..a0232d5da2 100644
--- a/protocols/Twitter/src/ui.cpp
+++ b/protocols/Twitter/src/ui.cpp
@@ -84,7 +84,7 @@ INT_PTR CALLBACK first_run_dialog(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM
 

 			GetDlgItemTextA(hwndDlg, IDC_SERVER, str, SIZEOF(str) - 1);

 			if (str[mir_strlen(str) - 1] != '/')

-				strncat(str, "/", SIZEOF(str) - mir_strlen(str));

+				mir_strncat(str, "/", SIZEOF(str) - mir_strlen(str));

 			db_set_s(0, proto->ModuleName(), TWITTER_KEY_BASEURL, str);

 

 			GetDlgItemText(hwndDlg, IDC_GROUP, tstr, SIZEOF(tstr));

@@ -231,7 +231,7 @@ INT_PTR CALLBACK options_proc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPar
 

 			GetDlgItemTextA(hwndDlg, IDC_BASEURL, str, SIZEOF(str) - 1);

 			if (str[mir_strlen(str) - 1] != '/')

-				strncat(str, "/", SIZEOF(str) - mir_strlen(str));

+				mir_strncat(str, "/", SIZEOF(str) - mir_strlen(str));

 			db_set_s(0, proto->ModuleName(), TWITTER_KEY_BASEURL, str);

 

 			db_set_b(0, proto->ModuleName(), TWITTER_KEY_CHATFEED, IsDlgButtonChecked(hwndDlg, IDC_CHATFEED) != 0);

diff --git a/protocols/Xfire/src/searching4games.cpp b/protocols/Xfire/src/searching4games.cpp
index d04686ea12..01fb52f082 100644
--- a/protocols/Xfire/src/searching4games.cpp
+++ b/protocols/Xfire/src/searching4games.cpp
@@ -69,9 +69,9 @@ BOOL CheckPath(char*ppath, char*pathwildcard = NULL)
 

 					strncpy(temp, ppath,XFIRE_MAX_STATIC_STRING_LEN-1);

 					*(temp + mir_strlen(temp) - 1) = 0;

-					strncat(temp, wfd.cFileName, SIZEOF(temp) - mir_strlen(temp));

-					strncat(temp, "\\", SIZEOF(temp) - mir_strlen(temp));

-					strncat(temp, pos, SIZEOF(temp) - mir_strlen(temp));

+					mir_strncat(temp, wfd.cFileName, SIZEOF(temp) - mir_strlen(temp));

+					mir_strncat(temp, "\\", SIZEOF(temp) - mir_strlen(temp));

+					mir_strncat(temp, pos, SIZEOF(temp) - mir_strlen(temp));

 

 					if (GetFileAttributesA(temp) != 0xFFFFFFFF) { //exe vorhanden???? unt hint?

 						//gefundenes in path kopieren

diff --git a/src/modules/utils/bmpfilter.cpp b/src/modules/utils/bmpfilter.cpp
index b97b2699b6..f2594ffc4c 100644
--- a/src/modules/utils/bmpfilter.cpp
+++ b/src/modules/utils/bmpfilter.cpp
@@ -144,37 +144,37 @@ static INT_PTR BmpFilterGetStrings(WPARAM wParam, LPARAM lParam)
 	char *filter = (char*)lParam, *pfilter;

 

 	mir_strncpy(filter, Translate("All bitmaps"), bytesLeft); bytesLeft -= mir_strlen(filter);

-	strncat(filter, " (*.bmp;*.jpg;*.gif;*.png)", bytesLeft);

+	mir_strncat(filter, " (*.bmp;*.jpg;*.gif;*.png)", bytesLeft);

 	pfilter = filter + mir_strlen(filter) + 1; bytesLeft = wParam - (pfilter - filter);

 	mir_strncpy(pfilter, "*.BMP;*.RLE;*.JPG;*.JPEG;*.GIF;*.PNG", bytesLeft);

 	pfilter += mir_strlen(pfilter) + 1; bytesLeft = wParam - (pfilter - filter);

 

 	mir_strncpy(pfilter, Translate("Windows bitmaps"), bytesLeft); bytesLeft -= mir_strlen(pfilter);

-	strncat(pfilter, " (*.bmp;*.rle)", bytesLeft);

+	mir_strncat(pfilter, " (*.bmp;*.rle)", bytesLeft);

 	pfilter += mir_strlen(pfilter) + 1; bytesLeft = wParam - (pfilter - filter);

 	mir_strncpy(pfilter, "*.BMP;*.RLE", bytesLeft);

 	pfilter += mir_strlen(pfilter) + 1; bytesLeft = wParam - (pfilter - filter);

 

 	mir_strncpy(pfilter, Translate("JPEG bitmaps"), bytesLeft); bytesLeft -= mir_strlen(pfilter);

-	strncat(pfilter, " (*.jpg;*.jpeg)", bytesLeft);

+	mir_strncat(pfilter, " (*.jpg;*.jpeg)", bytesLeft);

 	pfilter += mir_strlen(pfilter) + 1; bytesLeft = wParam - (pfilter - filter);

 	mir_strncpy(pfilter, "*.JPG;*.JPEG", bytesLeft);

 	pfilter += mir_strlen(pfilter) + 1; bytesLeft = wParam - (pfilter - filter);

 

 	mir_strncpy(pfilter, Translate("GIF bitmaps"), bytesLeft); bytesLeft -= mir_strlen(pfilter);

-	strncat(pfilter, " (*.gif)", bytesLeft);

+	mir_strncat(pfilter, " (*.gif)", bytesLeft);

 	pfilter += mir_strlen(pfilter) + 1; bytesLeft = wParam - (pfilter - filter);

 	mir_strncpy(pfilter, "*.GIF", bytesLeft);

 	pfilter += mir_strlen(pfilter) + 1; bytesLeft = wParam - (pfilter - filter);

 

 	mir_strncpy(pfilter, Translate("PNG bitmaps"), bytesLeft); bytesLeft -= mir_strlen(pfilter);

-	strncat(pfilter, " (*.png)", bytesLeft);

+	mir_strncat(pfilter, " (*.png)", bytesLeft);

 	pfilter += mir_strlen(pfilter) + 1; bytesLeft = wParam - (pfilter - filter);

 	mir_strncpy(pfilter, "*.PNG", bytesLeft);

 	pfilter += mir_strlen(pfilter) + 1; bytesLeft = wParam - (pfilter - filter);

 

 	mir_strncpy(pfilter, Translate("All files"), bytesLeft); bytesLeft -= mir_strlen(pfilter);

-	strncat(pfilter, " (*)", bytesLeft);

+	mir_strncat(pfilter, " (*)", bytesLeft);

 	pfilter += mir_strlen(pfilter) + 1; bytesLeft = wParam - (pfilter - filter);

 	mir_strncpy(pfilter, "*", bytesLeft);

 	pfilter += mir_strlen(pfilter) + 1; bytesLeft = wParam - (pfilter - filter);