From 6e53dfca72b932c4bdcd7aa02ca62bf8b2630eac Mon Sep 17 00:00:00 2001 From: George Hazan Date: Tue, 26 Jul 2016 09:20:25 +0000 Subject: 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 --- plugins/QuickMessages/src/main.cpp | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) (limited to 'plugins/QuickMessages/src/main.cpp') 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); } -- cgit v1.2.3