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

4 files changed, 79 insertions, 79 deletions

diff --git a/plugins/QuickMessages/src/Utils.cpp b/plugins/QuickMessages/src/Utils.cpp
index 9067c7ac12..82aa13cd5a 100644
--- a/plugins/QuickMessages/src/Utils.cpp
+++ b/plugins/QuickMessages/src/Utils.cpp
@@ -224,7 +224,7 @@ BYTE getEntryByte(int buttonnum, int entrynum, BOOL mode)
 
 static HANDLE AddIcon(char* szIcoName)
 {
-	TCHAR tszPath[MAX_PATH];
+	wchar_t tszPath[MAX_PATH];
 	GetModuleFileName(hinstance, tszPath, _countof(tszPath));
 
 	SKINICONDESC sid = { 0 };
@@ -232,7 +232,7 @@ static HANDLE AddIcon(char* szIcoName)
 	sid.section.a = "Quick Messages";
 	sid.description.a = szIcoName;
 	sid.pszName = szIcoName;
-	sid.defaultFile.t = tszPath;
+	sid.defaultFile.w = tszPath;
 	sid.iDefaultIndex = -IDI_QICON;
 	return IcoLib_AddIcon(&sid);
 }
@@ -269,7 +269,7 @@ void InitButtonsList()
 	int i, j, k = 0;
 	QuickList = List_Create(0, 1);
 	for (i = 0; i < g_iButtonsCount; i++) {
-		TCHAR* pszBName = NULL;
+		wchar_t* pszBName = NULL;
 		ListData* ld = NULL;
 		if (!(pszBName = getMenuEntry(i, 0, 3))) {
 			g_iButtonsCount = i;
@@ -286,7 +286,7 @@ void InitButtonsList()
 		ld->dwOPFlags = 0;
 		ld->bIsServName = ld->bIsOpServName = getEntryByte(i, 0, 3);
 		for (j = 0;; j++) {
-			TCHAR* pszEntry = NULL;
+			wchar_t* pszEntry = NULL;
 			ButtonData *bd = NULL;
 
 			if (!(pszEntry = getMenuEntry(i, j, 0)))
@@ -331,9 +331,9 @@ void DestructButtonsList()
 	}
 }
 
-TCHAR* getMenuEntry(int buttonnum, int entrynum, BYTE mode)
+wchar_t* getMenuEntry(int buttonnum, int entrynum, BYTE mode)
 {
-	TCHAR* buffer = NULL;
+	wchar_t* buffer = NULL;
 	char szMEntry[256];
 	DBVARIANT dbv;
 
@@ -387,18 +387,18 @@ int RegisterCustomButton(WPARAM, LPARAM)
 	return 0;
 }
 
-TCHAR* ParseString(MCONTACT hContact, TCHAR* ptszQValIn, TCHAR* ptszText, TCHAR* ptszClip, int QVSize, int TextSize, int ClipSize)
+wchar_t* ParseString(MCONTACT hContact, wchar_t* ptszQValIn, wchar_t* ptszText, wchar_t* ptszClip, int QVSize, int TextSize, int ClipSize)
 {
 	int i = 0, iOffset = 0;
-	TCHAR* tempPointer = NULL;
-	TCHAR* ptszQValue = _tcsdup(ptszQValIn);
-	TCHAR* tempQValue = ptszQValue;
-	TCHAR varstr = _T('%');
-	TCHAR* p = NULL;
+	wchar_t* tempPointer = NULL;
+	wchar_t* ptszQValue = wcsdup(ptszQValIn);
+	wchar_t* tempQValue = ptszQValue;
+	wchar_t varstr = '%';
+	wchar_t* p = NULL;
 	int NameLenght = 0;
-	TCHAR* ptszName = NULL;
+	wchar_t* ptszName = NULL;
 
-	if (!_tcschr(ptszQValue, varstr))
+	if (!wcschr(ptszQValue, varstr))
 		return ptszQValue;
 
 	if (TextSize && ptszText[TextSize - 1] == '\0')
@@ -414,18 +414,18 @@ TCHAR* ParseString(MCONTACT hContact, TCHAR* ptszQValIn, TCHAR* ptszText, TCHAR*
 
 		switch (ptszQValue[i + 1]) {
 		case 't':
-			p = (TCHAR *)realloc(tempQValue, (QVSize + TextSize + 1) * sizeof(TCHAR));
+			p = (wchar_t *)realloc(tempQValue, (QVSize + TextSize + 1) * sizeof(wchar_t));
 			if (!p)
 				break;
 			i = iOffset;
 			tempQValue = ptszQValue = p;
 
-			tempPointer = (TCHAR *)memmove(ptszQValue + i + TextSize, ptszQValue + i + 2, (QVSize - i - 1) * sizeof(TCHAR));
-			memcpy(ptszQValue + i, ptszText, TextSize * sizeof(TCHAR));
+			tempPointer = (wchar_t *)memmove(ptszQValue + i + TextSize, ptszQValue + i + 2, (QVSize - i - 1) * sizeof(wchar_t));
+			memcpy(ptszQValue + i, ptszText, TextSize * sizeof(wchar_t));
 			QVSize += (TextSize - 2);
 			ptszQValue[QVSize] = '\0';
 
-			if (!_tcschr(ptszQValue, varstr))
+			if (!wcschr(ptszQValue, varstr))
 				return ptszQValue;
 
 			ptszQValue = tempPointer;
@@ -433,18 +433,18 @@ TCHAR* ParseString(MCONTACT hContact, TCHAR* ptszQValIn, TCHAR* ptszText, TCHAR*
 			i = -1;
 			break;
 		case 'c':
-			p = (TCHAR *)realloc(tempQValue, (QVSize + ClipSize + 1) * sizeof(TCHAR));
+			p = (wchar_t *)realloc(tempQValue, (QVSize + ClipSize + 1) * sizeof(wchar_t));
 			if (!p)
 				break;
 			i = iOffset;
 			tempQValue = ptszQValue = p;
 
-			tempPointer = (TCHAR *)memmove(ptszQValue + i + ClipSize, ptszQValue + i + 2, (QVSize - i - 1) * sizeof(TCHAR));
-			memcpy(ptszQValue + i, ptszClip, ClipSize * sizeof(TCHAR));
+			tempPointer = (wchar_t *)memmove(ptszQValue + i + ClipSize, ptszQValue + i + 2, (QVSize - i - 1) * sizeof(wchar_t));
+			memcpy(ptszQValue + i, ptszClip, ClipSize * sizeof(wchar_t));
 			QVSize += (ClipSize - 2);
 			ptszQValue[QVSize] = '\0';
 
-			if (!_tcschr(ptszQValue, varstr))
+			if (!wcschr(ptszQValue, varstr))
 				return ptszQValue;
 
 			ptszQValue = tempPointer;
@@ -454,7 +454,7 @@ TCHAR* ParseString(MCONTACT hContact, TCHAR* ptszQValIn, TCHAR* ptszText, TCHAR*
 		case 'P':
 			ptszName = mir_a2u(GetContactProto(hContact));
 			NameLenght = (int)mir_tstrlen(ptszName);
-			p = (TCHAR *)realloc(tempQValue, (QVSize + NameLenght + 1) * sizeof(TCHAR));
+			p = (wchar_t *)realloc(tempQValue, (QVSize + NameLenght + 1) * sizeof(wchar_t));
 			if (!p) {
 				mir_free(ptszName);
 				break;
@@ -462,13 +462,13 @@ TCHAR* ParseString(MCONTACT hContact, TCHAR* ptszQValIn, TCHAR* ptszText, TCHAR*
 			i = iOffset;
 			tempQValue = ptszQValue = p;
 
-			tempPointer = (TCHAR *)memmove(ptszQValue + i + NameLenght, ptszQValue + i + 2, (QVSize - i - 1) * sizeof(TCHAR));
-			memcpy(ptszQValue + i, ptszName, NameLenght * sizeof(TCHAR));
+			tempPointer = (wchar_t *)memmove(ptszQValue + i + NameLenght, ptszQValue + i + 2, (QVSize - i - 1) * sizeof(wchar_t));
+			memcpy(ptszQValue + i, ptszName, NameLenght * sizeof(wchar_t));
 			QVSize += (NameLenght - 2);
 			mir_free(ptszName);
 			ptszQValue[QVSize] = '\0';
 
-			if (!_tcschr(ptszQValue, varstr))
+			if (!wcschr(ptszQValue, varstr))
 				return ptszQValue;
 
 			ptszQValue = tempPointer;
@@ -477,20 +477,20 @@ TCHAR* ParseString(MCONTACT hContact, TCHAR* ptszQValIn, TCHAR* ptszText, TCHAR*
 			break;
 
 		case 'n':
-			ptszName = (TCHAR *)pcli->pfnGetContactDisplayName(hContact, 0);
+			ptszName = (wchar_t *)pcli->pfnGetContactDisplayName(hContact, 0);
 			NameLenght = (int)mir_tstrlen(ptszName);
-			p = (TCHAR *)realloc(tempQValue, (QVSize + NameLenght + 1) * sizeof(TCHAR));
+			p = (wchar_t *)realloc(tempQValue, (QVSize + NameLenght + 1) * sizeof(wchar_t));
 			if (!p)
 				break;
 			i = iOffset;
 			tempQValue = ptszQValue = p;
 
-			tempPointer = (TCHAR *)memmove(ptszQValue + i + NameLenght, ptszQValue + i + 2, (QVSize - i - 1) * sizeof(TCHAR));
-			memcpy(ptszQValue + i, ptszName, NameLenght * sizeof(TCHAR));
+			tempPointer = (wchar_t *)memmove(ptszQValue + i + NameLenght, ptszQValue + i + 2, (QVSize - i - 1) * sizeof(wchar_t));
+			memcpy(ptszQValue + i, ptszName, NameLenght * sizeof(wchar_t));
 			QVSize += (NameLenght - 2);
 			ptszQValue[QVSize] = '\0';
 
-			if (!_tcschr(ptszQValue, varstr))
+			if (!wcschr(ptszQValue, varstr))
 				return ptszQValue;
 
 			ptszQValue = tempPointer;
@@ -502,7 +502,7 @@ TCHAR* ParseString(MCONTACT hContact, TCHAR* ptszQValIn, TCHAR* ptszText, TCHAR*
 			if (ptszName == NULL)
 				break;
 			NameLenght = (int)mir_tstrlen(ptszName);
-			p = (TCHAR *)realloc(tempQValue, (QVSize + NameLenght + 1) * sizeof(TCHAR));
+			p = (wchar_t *)realloc(tempQValue, (QVSize + NameLenght + 1) * sizeof(wchar_t));
 			if (!p) {
 				mir_free(ptszName);
 				break;
@@ -510,13 +510,13 @@ TCHAR* ParseString(MCONTACT hContact, TCHAR* ptszQValIn, TCHAR* ptszText, TCHAR*
 			i = iOffset;
 			tempQValue = ptszQValue = p;
 
-			tempPointer = (TCHAR *)memmove(ptszQValue + i + NameLenght, ptszQValue + i + 2, (QVSize - i - 1) * sizeof(TCHAR));
-			memcpy(ptszQValue + i, ptszName, NameLenght * sizeof(TCHAR));
+			tempPointer = (wchar_t *)memmove(ptszQValue + i + NameLenght, ptszQValue + i + 2, (QVSize - i - 1) * sizeof(wchar_t));
+			memcpy(ptszQValue + i, ptszName, NameLenght * sizeof(wchar_t));
 			QVSize += (NameLenght - 2);
 			mir_free(ptszName);
 			ptszQValue[QVSize] = '\0';
 
-			if (!_tcschr(ptszQValue, varstr))
+			if (!wcschr(ptszQValue, varstr))
 				return ptszQValue;
 
 			ptszQValue = tempPointer;
@@ -529,7 +529,7 @@ TCHAR* ParseString(MCONTACT hContact, TCHAR* ptszQValIn, TCHAR* ptszText, TCHAR*
 				break;
 
 			NameLenght = (int)mir_tstrlen(ptszName);
-			p = (TCHAR *)realloc(tempQValue, (QVSize + NameLenght + 1) * sizeof(TCHAR));
+			p = (wchar_t *)realloc(tempQValue, (QVSize + NameLenght + 1) * sizeof(wchar_t));
 			if (!p) {
 				mir_free(ptszName);
 				break;
@@ -537,13 +537,13 @@ TCHAR* ParseString(MCONTACT hContact, TCHAR* ptszQValIn, TCHAR* ptszText, TCHAR*
 			i = iOffset;
 			tempQValue = ptszQValue = p;
 
-			tempPointer = (TCHAR *)memmove(ptszQValue + i + NameLenght, ptszQValue + i + 2, (QVSize - i - 1) * sizeof(TCHAR));
-			memcpy(ptszQValue + i, ptszName, NameLenght * sizeof(TCHAR));
+			tempPointer = (wchar_t *)memmove(ptszQValue + i + NameLenght, ptszQValue + i + 2, (QVSize - i - 1) * sizeof(wchar_t));
+			memcpy(ptszQValue + i, ptszName, NameLenght * sizeof(wchar_t));
 			QVSize += (NameLenght - 2);
 			mir_free(ptszName);
 			ptszQValue[QVSize] = '\0';
 
-			if (!_tcschr(ptszQValue, varstr))
+			if (!wcschr(ptszQValue, varstr))
 				return ptszQValue;
 
 			ptszQValue = tempPointer;
diff --git a/plugins/QuickMessages/src/Utils.h b/plugins/QuickMessages/src/Utils.h
index 3f4d11770c..adfd0ffa76 100644
--- a/plugins/QuickMessages/src/Utils.h
+++ b/plugins/QuickMessages/src/Utils.h
@@ -34,10 +34,10 @@ typedef struct _tagButtonData
 	BYTE  bInQMenu;

 	BYTE  bOpInQMenu;

 	DWORD dwOPFlags;

-	TCHAR *pszName;

-	TCHAR *pszValue;

-	TCHAR *pszOpValue;

-	TCHAR *pszOpName;

+	wchar_t *pszName;

+	wchar_t *pszValue;

+	wchar_t *pszOpValue;

+	wchar_t *pszOpName;

 	}ButtonData;

 

 typedef struct _tagListData

@@ -45,9 +45,9 @@ typedef struct _tagListData
 	SortedList* sl;

 	DWORD dwPos;

 	DWORD dwOPPos;

-	TCHAR* ptszQValue;

-	TCHAR* ptszOPQValue;

-	TCHAR* ptszButtonName;

+	wchar_t* ptszQValue;

+	wchar_t* ptszOPQValue;

+	wchar_t* ptszButtonName;

 	BYTE  bIsServName;

 	BYTE  bIsOpServName;

 	DWORD dwOPFlags;

@@ -58,8 +58,8 @@ typedef struct _tagQuickData
 	DWORD dwPos;

 	BOOL bIsService;

 	BYTE fEntryType;

-	TCHAR* ptszValue;

-	TCHAR* ptszValueName;

+	wchar_t* ptszValue;

+	wchar_t* ptszValueName;

 	}QuickData;

 

 void InitButtonsList();

@@ -68,11 +68,11 @@ int  sstSortButtons(const void * vmtbi1, const void * vmtbi2);
 int  sstOpSortButtons(const void * vmtbi1, const void * vmtbi2);

 int  sstQuickSortButtons(const void * vmtbi1, const void * vmtbi2);

 void li_ZeroQuickList(SortedList *pList);

-TCHAR* getMenuEntry(int entrynum,int buttonnum,BYTE mode) ;

+wchar_t* getMenuEntry(int entrynum,int buttonnum,BYTE mode) ;

 int RegisterCustomButton(WPARAM wParam,LPARAM lParam);

 void RemoveMenuEntryNode(SortedList *pList, int index);

 void DestroyButton(int listnum);

 void SaveModuleSettings(int buttonnum,ButtonData* bd);

 void CleanSettings(int buttonnum,int from);

 DWORD BalanceButtons(int buttonsWas,int buttonsNow);

-TCHAR* ParseString(MCONTACT hContact,TCHAR* ptszQValueIn,TCHAR* ptszText,TCHAR* ptszClip,int QVSize,int TextSize ,int ClipSize);

+wchar_t* ParseString(MCONTACT hContact,wchar_t* ptszQValueIn,wchar_t* ptszText,wchar_t* ptszClip,int QVSize,int TextSize ,int ClipSize);

diff --git a/plugins/QuickMessages/src/main.cpp b/plugins/QuickMessages/src/main.cpp
index 83eca17bda..6dc22694c7 100644
--- a/plugins/QuickMessages/src/main.cpp
+++ b/plugins/QuickMessages/src/main.cpp
@@ -74,26 +74,26 @@ static int InputMenuPopup(WPARAM, LPARAM lParam)
 				AppendMenu(hSubMenu, MF_STRING, qd->dwPos + 254, qd->ptszValueName);

 		}

 	}

-	else if (mwpd->uType == MSG_WINDOWPOPUP_SELECTED&&mwpd->selection >= 254) {

+	else if (mwpd->uType == MSG_WINDOWPOPUP_SELECTED && mwpd->selection >= 254) {

 		for (i = 0; i < QuickList->realCount; i++) {

 			QuickData* qd = (QuickData *)QuickList->items[i];

 			if ((qd->dwPos + 254) == mwpd->selection) {

 				CHARRANGE cr;

 				UINT textlenght = 0;

-				TCHAR* pszText = NULL;

-				TCHAR* ptszQValue = NULL;

-				TCHAR* pszCBText = NULL;

+				wchar_t* pszText = NULL;

+				wchar_t* ptszQValue = NULL;

+				wchar_t* pszCBText = NULL;

 				BOOL bIsService = 0;

 

 				if (IsClipboardFormatAvailable(CF_TEXT)) {

 					if (OpenClipboard(mwpd->hwnd)) {

 						HANDLE hData = NULL;

-						TCHAR* chBuffer = NULL;

+						wchar_t* chBuffer = NULL;

 						int textLength = 0;

 

 						hData = GetClipboardData(CF_UNICODETEXT);

 

-						chBuffer = (TCHAR*)GlobalLock(hData);

+						chBuffer = (wchar_t*)GlobalLock(hData);

 						textLength = (int)mir_tstrlen(chBuffer);

 						pszCBText = mir_tstrdup(chBuffer);

 						GlobalUnlock(hData);

@@ -105,8 +105,8 @@ static int InputMenuPopup(WPARAM, LPARAM lParam)
 				textlenght = cr.cpMax - cr.cpMin;

 

 				if (textlenght) {

-					pszText = (TCHAR *)mir_alloc((textlenght + 10)*sizeof(TCHAR));

-					memset(pszText, 0, ((textlenght + 10) * sizeof(TCHAR)));

+					pszText = (wchar_t *)mir_alloc((textlenght + 10)*sizeof(wchar_t));

+					memset(pszText, 0, ((textlenght + 10) * sizeof(wchar_t)));

 					SendMessage(mwpd->hwnd, EM_GETSELTEXT, 0, (LPARAM)pszText);

 				}

 				if (qd->ptszValue) {

@@ -139,9 +139,9 @@ static int CustomButtonPressed(WPARAM, LPARAM lParam)
 	HWND hEdit = NULL;

 	BOOL bCTRL = 0;

 	BOOL bIsService = 0;

-	TCHAR* pszText = NULL;

-	TCHAR* pszCBText = NULL;

-	TCHAR* ptszQValue = NULL;

+	wchar_t* pszText = NULL;

+	wchar_t* pszCBText = NULL;

+	wchar_t* ptszQValue = NULL;

 	UINT textlenght = 0;

 	SortedList* sl = NULL;

 	int state = 0;

@@ -157,12 +157,12 @@ static int CustomButtonPressed(WPARAM, LPARAM lParam)
 	if (IsClipboardFormatAvailable(CF_TEXT)) {

 		if (OpenClipboard(cbcd->hwndFrom)) {

 			HANDLE hData = NULL;

-			TCHAR* chBuffer = NULL;

+			wchar_t* chBuffer = NULL;

 			int textLength = 0;

 

 			hData = GetClipboardData(CF_UNICODETEXT);

 

-			chBuffer = (TCHAR*)GlobalLock(hData);

+			chBuffer = (wchar_t*)GlobalLock(hData);

 			textLength = (int)mir_tstrlen(chBuffer);

 			pszCBText = mir_tstrdup(chBuffer);

 			GlobalUnlock(hData);

@@ -180,8 +180,8 @@ static int CustomButtonPressed(WPARAM, LPARAM lParam)
 

 	textlenght = cr.cpMax - cr.cpMin;

 	if (textlenght) {

-		pszText = (TCHAR *)mir_alloc((textlenght + 10)*sizeof(TCHAR));

-		memset(pszText, 0, ((textlenght + 10) * sizeof(TCHAR)));

+		pszText = (wchar_t *)mir_alloc((textlenght + 10)*sizeof(wchar_t));

+		memset(pszText, 0, ((textlenght + 10) * sizeof(wchar_t)));

 		SendMessage(hEdit, EM_GETSELTEXT, 0, (LPARAM)pszText);

 	}

 

diff --git a/plugins/QuickMessages/src/options.cpp b/plugins/QuickMessages/src/options.cpp
index 412d57f2cb..65d55d874a 100644
--- a/plugins/QuickMessages/src/options.cpp
+++ b/plugins/QuickMessages/src/options.cpp
@@ -119,7 +119,7 @@ void SetMenuEntryProperties(HWND hdlg)
 

 		if (tvi.lParam) {

 			ListData* ld = (ListData*)tvi.lParam;

-			TCHAR szValue[256];

+			wchar_t szValue[256];

 			GetDlgItemText(hdlg, IDC_RCLICKVALUE, szValue, _countof(szValue));

 			if (mir_tstrlen(szValue)) {

 				if (ld->ptszOPQValue && (ld->ptszOPQValue != ld->ptszQValue))

@@ -137,7 +137,7 @@ void SetMenuEntryProperties(HWND hdlg)
 

 		if (tvi.lParam) {

 			ButtonData *bd = (ButtonData*)tvi.lParam;

-			TCHAR szValue[256];

+			wchar_t szValue[256];

 			GetDlgItemText(hdlg, IDC_MENUVALUE, szValue, _countof(szValue));

 			if (mir_tstrlen(szValue)) {

 				if (mir_tstrlen(bd->pszOpValue) && (bd->pszOpValue != bd->pszValue))

@@ -177,7 +177,7 @@ void SetMenuEntryProperties(HWND hdlg)
 			}

 			else {

 				if (!bd->pszOpValue)

-					bd->pszOpValue = mir_tstrdup(LPGENT("Enter Value"));

+					bd->pszOpValue = mir_tstrdup(LPGENW("Enter Value"));

 			}

 			if (TreeView_GetParent(hMenuTree, tvi.hItem))

 				bd->fEntryOpType |= QMF_EX_CHILD;

@@ -198,7 +198,7 @@ void SaveMenuTree()
 	int iBtd = g_iButtonsCount;

 	BOOL bDeleted = FALSE;

 	char szMEntry[256] = { '\0' };

-	TCHAR strbuf[256];

+	wchar_t strbuf[256];

 	HTREEITEM hti = NULL;

 	TVITEM tvi;

 

@@ -439,7 +439,7 @@ static int BuildButtonsList(HWND hToolBarTree)
 void MoveItem(HTREEITEM hItem, HTREEITEM hInsertAfter, BOOLEAN bAsChild)

 {

 	TVINSERTSTRUCT tvis;

-	//TCHAR strbuf[128];

+	//wchar_t strbuf[128];

 	HTREEITEM hParent, hChild, hNewItem;

 

 	if (!hItem || !hInsertAfter)

@@ -464,7 +464,7 @@ void MoveItem(HTREEITEM hItem, HTREEITEM hInsertAfter, BOOLEAN bAsChild)
 

 	// prepare the insert structure

 	{

-		TCHAR strbuf[128];

+		wchar_t strbuf[128];

 		tvis.item.mask = TVIF_HANDLE | TVIF_PARAM | TVIF_TEXT;

 

 		tvis.item.pszText = strbuf;

@@ -737,8 +737,8 @@ INT_PTR CALLBACK OptionsProc(HWND hdlg, UINT msg, WPARAM wparam, LPARAM lparam)
 				{

 					TVITEM tvi;

 					ButtonData* bd = NULL;

-					TCHAR strbuf[256];

-					TCHAR szLabel[256];

+					wchar_t strbuf[256];

+					wchar_t szLabel[256];

 

 					tvi.pszText = strbuf;

 					tvi.cchTextMax = _countof(strbuf);

@@ -802,7 +802,7 @@ INT_PTR CALLBACK OptionsProc(HWND hdlg, UINT msg, WPARAM wparam, LPARAM lparam)
 

 					ButtonData *bd = (ButtonData*)tvi.lParam;

 					if (bd) {

-						TCHAR szValue[256];

+						wchar_t szValue[256];

 						GetDlgItemText(hdlg, IDC_MENUVALUE, szValue, _countof(szValue));

 						if (mir_tstrlen(szValue)) {

 							if (bd->pszOpValue && (bd->pszOpValue != bd->pszValue))

@@ -866,8 +866,8 @@ INT_PTR CALLBACK OptionsProc(HWND hdlg, UINT msg, WPARAM wparam, LPARAM lparam)
 			case TVN_ENDLABELEDIT:

 				{

 					TVITEM tvi;

-					TCHAR strbuf[128];

-					TCHAR szLabel[128];

+					wchar_t strbuf[128];

+					wchar_t szLabel[128];

 

 					tvi.pszText = strbuf;

 					tvi.cchTextMax = _countof(strbuf);

@@ -941,7 +941,7 @@ INT_PTR CALLBACK OptionsProc(HWND hdlg, UINT msg, WPARAM wparam, LPARAM lparam)
 			{

 				TVINSERTSTRUCT tvis;

 				ListData* ld = NULL;

-				TCHAR namebuff[MAX_PATH] = { '\0' };

+				wchar_t namebuff[MAX_PATH] = { '\0' };

 				int count = TreeView_GetCount(hButtonsList);

 				if (count > 10) break;

 				if (g_iOPButtonsCount == 99) {

@@ -1003,7 +1003,7 @@ INT_PTR CALLBACK OptionsProc(HWND hdlg, UINT msg, WPARAM wparam, LPARAM lparam)
 				TVITEM tvi;

 				ButtonData *bd = NULL;

 				SortedList *sl = NULL;

-				TCHAR namebuff[MAX_PATH] = { '\0' };

+				wchar_t namebuff[MAX_PATH] = { '\0' };

 

 				if (!TreeView_GetCount(hButtonsList)) break;

 				if (!(tvi.hItem = TreeView_GetSelection(hButtonsList))) break;

@@ -1054,7 +1054,7 @@ INT_PTR CALLBACK OptionsProc(HWND hdlg, UINT msg, WPARAM wparam, LPARAM lparam)
 				bd->dwOPFlags |= QMF_DELETNEEDED;

 

 				if (tvi.hItem = TreeView_GetChild(hMenuTree, tvi.hItem)) {

-					TCHAR strbuf[128];

+					wchar_t strbuf[128];

 					while (tvi.hItem) {

 						tvis.hInsertAfter = hti;

 						tvi.pszText = strbuf;