less TCHARs:

- TCHAR is replaced with wchar_t everywhere;
- LPGENT replaced with either LPGENW or LPGEN;
- fixes for ANSI plugins that improperly used _t functions;
- TCHAR *t removed from MAllStrings;
- ptszGroup, ptszTitle & ptszTab in OPTIONSDIALOGPAGE replaced with pwsz*

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

1 files changed, 7 insertions, 7 deletions

diff --git a/plugins/SMS/src/functions.cpp b/plugins/SMS/src/functions.cpp
index 7c42dc769c..d6256e4726 100644
--- a/plugins/SMS/src/functions.cpp
+++ b/plugins/SMS/src/functions.cpp
@@ -402,31 +402,31 @@ DWORD ReplaceInBuff(LPVOID lpInBuff, size_t dwInBuffSize, size_t dwReplaceItemsC
 

 

 static const LPTSTR lpszXMLTags[] = { TEXT("'"),		TEXT("""),		TEXT("&"),		TEXT("<"),		TEXT(">") };

-static const size_t dwXMLTagsCount[] = { (6 * sizeof(TCHAR)),	(6 * sizeof(TCHAR)),	(5 * sizeof(TCHAR)),	(4 * sizeof(TCHAR)),	(4 * sizeof(TCHAR)) };

+static const size_t dwXMLTagsCount[] = { (6 * sizeof(wchar_t)),	(6 * sizeof(wchar_t)),	(5 * sizeof(wchar_t)),	(4 * sizeof(wchar_t)),	(4 * sizeof(wchar_t)) };

 static const LPTSTR lpszXMLSymbols[] = { TEXT("\'"),			TEXT("\""),			TEXT("&"),			TEXT("<"),			TEXT(">") };

-static const size_t dwXMLSymbolsCount[] = { sizeof(TCHAR),		sizeof(TCHAR),		sizeof(TCHAR),		sizeof(TCHAR),		sizeof(TCHAR) };

+static const size_t dwXMLSymbolsCount[] = { sizeof(wchar_t),		sizeof(wchar_t),		sizeof(wchar_t),		sizeof(wchar_t),		sizeof(wchar_t) };

 

 //Decode XML coded string. The function translate special xml code into standard characters.

 DWORD DecodeXML(LPTSTR lptszMessage, size_t dwMessageSize, LPTSTR lptszMessageConverted, size_t dwMessageConvertedBuffSize, size_t *pdwMessageConvertedSize)

 {

-	DWORD dwRet = ReplaceInBuff(lptszMessage, (dwMessageSize*sizeof(TCHAR)), _countof(lpszXMLTags), (LPVOID*)lpszXMLTags, (size_t*)dwXMLTagsCount, (LPVOID*)lpszXMLSymbols, (size_t*)dwXMLSymbolsCount, lptszMessageConverted, (dwMessageConvertedBuffSize*sizeof(TCHAR)), pdwMessageConvertedSize);

+	DWORD dwRet = ReplaceInBuff(lptszMessage, (dwMessageSize*sizeof(wchar_t)), _countof(lpszXMLTags), (LPVOID*)lpszXMLTags, (size_t*)dwXMLTagsCount, (LPVOID*)lpszXMLSymbols, (size_t*)dwXMLSymbolsCount, lptszMessageConverted, (dwMessageConvertedBuffSize*sizeof(wchar_t)), pdwMessageConvertedSize);

 

-	if (pdwMessageConvertedSize) (*pdwMessageConvertedSize) /= sizeof(TCHAR);

+	if (pdwMessageConvertedSize) (*pdwMessageConvertedSize) /= sizeof(wchar_t);

 	return(dwRet);

 }

 

 //Encode XML coded string. The function translate special saved xml characters into special characters.

 DWORD EncodeXML(LPTSTR lptszMessage, size_t dwMessageSize, LPTSTR lptszMessageConverted, size_t dwMessageConvertedBuffSize, size_t *pdwMessageConvertedSize)

 {

-	DWORD dwRet = ReplaceInBuff(lptszMessage, (dwMessageSize*sizeof(TCHAR)), _countof(lpszXMLTags), (LPVOID*)lpszXMLSymbols, (size_t*)dwXMLSymbolsCount, (LPVOID*)lpszXMLTags, (size_t*)dwXMLTagsCount, lptszMessageConverted, (dwMessageConvertedBuffSize*sizeof(TCHAR)), pdwMessageConvertedSize);

+	DWORD dwRet = ReplaceInBuff(lptszMessage, (dwMessageSize*sizeof(wchar_t)), _countof(lpszXMLTags), (LPVOID*)lpszXMLSymbols, (size_t*)dwXMLSymbolsCount, (LPVOID*)lpszXMLTags, (size_t*)dwXMLTagsCount, lptszMessageConverted, (dwMessageConvertedBuffSize*sizeof(wchar_t)), pdwMessageConvertedSize);

 

-	if (pdwMessageConvertedSize) (*pdwMessageConvertedSize) /= sizeof(TCHAR);

+	if (pdwMessageConvertedSize) (*pdwMessageConvertedSize) /= sizeof(wchar_t);

 	return(dwRet);

 }

 

 

 //(Taken from Miranda-IM source code:)

-BYTE MsgDlgGetFontDefaultCharset(const TCHAR*)

+BYTE MsgDlgGetFontDefaultCharset(const wchar_t*)

 {

 	return(DEFAULT_CHARSET);

 }