resource clearance moved to ME_SYSTEM_PRESHUTDOWN instead of ME_SYSTEM_OKTOEXIT

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

1 files changed, 6 insertions, 67 deletions

diff --git a/plugins/SendScreenshotPlus/src/mir_string.cpp b/plugins/SendScreenshotPlus/src/mir_string.cpp
index 251b5fd45e..d3550e6a04 100644
--- a/plugins/SendScreenshotPlus/src/mir_string.cpp
+++ b/plugins/SendScreenshotPlus/src/mir_string.cpp
@@ -27,15 +27,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 

 #include "global.h"

 

-char	*mir_strncpy(char *pszDest, const char *pszSrc, const size_t cchDest)

-{

-	if (!pszDest || !pszSrc || !cchDest)

-		return NULL;

-	pszDest = strncpy(pszDest, pszSrc, cchDest-1);

-	pszDest[cchDest-1] = 0;

-	return pszDest;

-}

-

 wchar_t	*mir_wcsncpy(wchar_t *pszDest, const wchar_t *pszSrc, const size_t cchDest)

 {

 	if (!pszDest || !pszSrc || !cchDest)

@@ -45,15 +36,6 @@ wchar_t	*mir_wcsncpy(wchar_t *pszDest, const wchar_t *pszSrc, const size_t cchDe
 	return pszDest;

 }

 

-char	*mir_strncat(char *pszDest, const char *pszSrc, const size_t cchDest)

-{

-	if (!pszDest || !pszSrc || !cchDest)

-		return NULL;

-	strncat(pszDest, pszSrc, cchDest-1);

-	pszDest[cchDest-1] = 0;

-	return pszDest;

-}

-

 wchar_t	*mir_wcsncat(wchar_t *pszDest, const wchar_t *pszSrc, const size_t cchDest)

 {

 	if (!pszDest || !pszSrc || !cchDest)

@@ -63,55 +45,14 @@ wchar_t	*mir_wcsncat(wchar_t *pszDest, const wchar_t *pszSrc, const size_t cchDe
 	return pszDest;

 }

 

-char	*mir_strncat_c(char *pszDest, const char cSrc) {

-	size_t lenNew = strlen(pszDest) + 2;

-	if (!pszDest)

-		pszDest = (char *) mir_alloc(sizeof(char) * lenNew);

-	else

-		pszDest = (char *) mir_realloc(pszDest, sizeof(char) * lenNew);

-	pszDest[lenNew-2] = cSrc;

-	pszDest[lenNew-1] = 0;

-	return pszDest;

-}

-

-wchar_t	*mir_wcsncat_c(wchar_t *pwszDest, const wchar_t wcSrc) {

-	size_t lenNew = wcslen(pwszDest) + 2;

-	if (!pwszDest)

-		pwszDest = (wchar_t *) mir_alloc(sizeof(wchar_t) * lenNew);

-	else

-		pwszDest = (wchar_t *) mir_realloc(pwszDest, sizeof(wchar_t) * lenNew);

-	pwszDest[lenNew-2] = wcSrc;

-	pwszDest[lenNew-1] = 0;

-	return pwszDest;

-}

-

-char	*mir_strnerase(char *pszDest, size_t sizeFrom, size_t sizeTo) {

-	char *pszReturn = NULL;

-	size_t sizeNew, sizeLen = strlen(pszDest);

-	if (sizeFrom >= 0 && sizeFrom < sizeLen && sizeTo >= 0 && sizeTo <= sizeLen && sizeFrom < sizeTo) {

-		sizeNew = sizeLen - (sizeTo - sizeFrom);

-		size_t sizeCopy = sizeNew - sizeFrom;

-		pszReturn = (char *) mir_alloc(sizeNew + 1);

-		memcpy(pszReturn, pszDest, sizeFrom);

-		memcpy(pszReturn + sizeFrom, pszDest + sizeTo, sizeCopy);

-		pszReturn[sizeNew] = 0;

-	}

-

-	pszDest = (char *) mir_realloc(pszDest, sizeNew + 1);

-	pszDest = mir_strcpy(pszDest, pszReturn);

-	mir_free(pszReturn);

-	return pszDest;

-}

-

 //---------------------------------------------------------------------------

 void	mir_stradd(char*	&pszDest, const char	*pszSrc)

 {

-	if(!pszSrc) {

+	if(!pszSrc)

 		return;

-	}

-	else if(!pszDest) {

+

+	if(!pszDest)

 		pszDest = mir_strdup(pszSrc);

-	}

 	else {

 		size_t lenDest  = strlen(pszDest);

 		size_t lenSrc   = strlen(pszSrc);

@@ -125,12 +66,11 @@ void	mir_stradd(char*	&pszDest, const char	*pszSrc)
 

 void	mir_wcsadd(wchar_t*	&pszDest, const wchar_t	*pszSrc)

 {

-	if(!pszSrc) {

+	if(!pszSrc)

 		return;

-	}

-	else if(!pszDest) {

+

+	if(!pszDest)

 		pszDest = mir_wstrdup(pszSrc);

-	}

 	else {

 		size_t lenDest  = wcslen(pszDest);

 		size_t lenSrc   = wcslen(pszSrc);

@@ -141,4 +81,3 @@ void	mir_wcsadd(wchar_t*	&pszDest, const wchar_t	*pszSrc)
 		pszDest[lenNew-1] = 0;

 	}

 }

-