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 --- src/core/stdhelp/src/about.cpp | 6 +++--- src/core/stdhelp/src/help.cpp | 2 +- src/core/stdhelp/src/stdafx.h | 1 - 3 files changed, 4 insertions(+), 5 deletions(-) (limited to 'src/core/stdhelp') diff --git a/src/core/stdhelp/src/about.cpp b/src/core/stdhelp/src/about.cpp index 7ef45cf054..5fca697ade 100644 --- a/src/core/stdhelp/src/about.cpp +++ b/src/core/stdhelp/src/about.cpp @@ -32,7 +32,7 @@ INT_PTR CALLBACK DlgProcAbout(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPar switch (msg) { case WM_INITDIALOG: TranslateDialogDefault(hwndDlg); - { TCHAR filename[MAX_PATH], *productCopyright; + { wchar_t filename[MAX_PATH], *productCopyright; DWORD unused; DWORD verInfoSize; UINT blockSize; @@ -50,7 +50,7 @@ INT_PTR CALLBACK DlgProcAbout(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPar char productVersion[56]; CallService(MS_SYSTEM_GETVERSIONTEXT, _countof(productVersion), (LPARAM)productVersion); - TCHAR str[64]; + wchar_t str[64]; mir_sntprintf(str, STR_VERSION_FORMAT, productVersion); SetDlgItemText(hwndDlg, IDC_HEADERBAR, str); } @@ -65,7 +65,7 @@ INT_PTR CALLBACK DlgProcAbout(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPar char* pszMsgt = (char*)alloca(ResSize + 1); memcpy(pszMsgt, pszMsg, ResSize); pszMsgt[ResSize] = 0; - TCHAR *ptszMsg; + wchar_t *ptszMsg; if (ResSize >=3 && pszMsgt[0] == '\xef' && pszMsgt[1] == '\xbb' && pszMsgt[2] == '\xbf') ptszMsg = Utf8DecodeT(pszMsgt + 3); else diff --git a/src/core/stdhelp/src/help.cpp b/src/core/stdhelp/src/help.cpp index 25b53757ea..a72cce44af 100644 --- a/src/core/stdhelp/src/help.cpp +++ b/src/core/stdhelp/src/help.cpp @@ -74,7 +74,7 @@ int LoadHelpModule(void) CreateServiceFunction("Help/BugCommand", BugCommand); CMenuItem mi; - mi.root = Menu_CreateRoot(MO_MAIN, LPGENT("&Help"), 2000090000); + mi.root = Menu_CreateRoot(MO_MAIN, LPGENW("&Help"), 2000090000); Menu_ConfigureItem(mi.root, MCI_OPT_UID, "8824ECA5-6942-46D7-9D07-1BA600E0D02E"); SET_UID(mi, 0xf3ebf1fa, 0x587c, 0x494d, 0xbd, 0x33, 0x7f, 0x88, 0xb3, 0x61, 0x1e, 0xd3); diff --git a/src/core/stdhelp/src/stdafx.h b/src/core/stdhelp/src/stdafx.h index 04c94e8013..4d3797d0df 100644 --- a/src/core/stdhelp/src/stdafx.h +++ b/src/core/stdhelp/src/stdafx.h @@ -22,7 +22,6 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include #include #include #include -- cgit v1.2.3