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/miranda32/src/miranda.cpp | 16 ++++++++-------- src/miranda32/src/stdafx.h | 2 -- 2 files changed, 8 insertions(+), 10 deletions(-) (limited to 'src/miranda32') diff --git a/src/miranda32/src/miranda.cpp b/src/miranda32/src/miranda.cpp index d8c1b60ad2..165f9ff1ed 100644 --- a/src/miranda32/src/miranda.cpp +++ b/src/miranda32/src/miranda.cpp @@ -26,12 +26,12 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. typedef int (WINAPI *pfnMain)(LPTSTR); -int WINAPI _tWinMain(HINSTANCE hInstance, HINSTANCE, LPTSTR cmdLine, int) +int WINAPI wWinMain(HINSTANCE hInstance, HINSTANCE, LPTSTR cmdLine, int) { - TCHAR tszPath[MAX_PATH]; + wchar_t tszPath[MAX_PATH]; GetModuleFileName(hInstance, tszPath, _countof(tszPath)); - TCHAR *p = _tcsrchr(tszPath, '\\'); + wchar_t *p = wcsrchr(tszPath, '\\'); if (p == NULL) return 4; @@ -39,13 +39,13 @@ int WINAPI _tWinMain(HINSTANCE hInstance, HINSTANCE, LPTSTR cmdLine, int) p[1] = 0; SetCurrentDirectory(tszPath); - _tcsncat_s(tszPath, L"libs", _TRUNCATE); - DWORD cbPath = (DWORD)_tcslen(tszPath); + wcsncat_s(tszPath, L"libs", _TRUNCATE); + DWORD cbPath = (DWORD)wcslen(tszPath); DWORD cbSize = GetEnvironmentVariable(L"PATH", NULL, 0); - TCHAR *ptszVal = new TCHAR[cbSize + MAX_PATH + 2]; - _tcscpy(ptszVal, tszPath); - _tcscat(ptszVal, L";"); + wchar_t *ptszVal = new wchar_t[cbSize + MAX_PATH + 2]; + wcscpy(ptszVal, tszPath); + wcscat(ptszVal, L";"); GetEnvironmentVariable(L"PATH", ptszVal + cbPath + 1, cbSize); SetEnvironmentVariable(L"PATH", ptszVal); diff --git a/src/miranda32/src/stdafx.h b/src/miranda32/src/stdafx.h index 56433df124..030e0539b5 100644 --- a/src/miranda32/src/stdafx.h +++ b/src/miranda32/src/stdafx.h @@ -23,5 +23,3 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include - -#include -- cgit v1.2.3