diff options
| author | George Hazan <george.hazan@gmail.com> | 2016-07-26 09:20:25 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2016-07-26 09:20:25 +0000 |
| commit | 6e53dfca72b932c4bdcd7aa02ca62bf8b2630eac (patch) | |
| tree | 2e8bb660c908b54914abd562af8aafa4a486c846 /plugins/Folders/src/services.cpp | |
| parent | a61c8728b379057fe7f0a0d86fe0b037598229dd (diff) | |
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
Diffstat (limited to 'plugins/Folders/src/services.cpp')
| -rw-r--r-- | plugins/Folders/src/services.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/plugins/Folders/src/services.cpp b/plugins/Folders/src/services.cpp index 348db4468e..de7669c4e9 100644 --- a/plugins/Folders/src/services.cpp +++ b/plugins/Folders/src/services.cpp @@ -22,10 +22,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #define DEFAULT_SECTION "Unknown"
-TCHAR szCurrentProfilePath[MAX_FOLDERS_PATH];
-TCHAR szCurrentProfile[MAX_FOLDERS_PATH];
-TCHAR szMirandaPath[MAX_FOLDERS_PATH];
-TCHAR szUserDataPath[MAX_FOLDERS_PATH];
+wchar_t szCurrentProfilePath[MAX_FOLDERS_PATH];
+wchar_t szCurrentProfile[MAX_FOLDERS_PATH];
+wchar_t szMirandaPath[MAX_FOLDERS_PATH];
+wchar_t szUserDataPath[MAX_FOLDERS_PATH];
INT_PTR RegisterPathService(WPARAM, LPARAM lParam)
{
@@ -69,7 +69,7 @@ INT_PTR GetPathService(WPARAM wParam, LPARAM lParam) CMString buf(p->Expand());
if (data->flags & FF_UNICODE)
- _tcsncpy_s(data->szPathT, data->nMaxPathSize, buf, _TRUNCATE);
+ wcsncpy_s(data->szPathT, data->nMaxPathSize, buf, _TRUNCATE);
else
strncpy_s(data->szPath, data->nMaxPathSize, _T2A(buf), _TRUNCATE);
return 0;
@@ -81,12 +81,12 @@ int InitServices() {
CallService(MS_DB_GETPROFILEPATHT, _countof(szCurrentProfilePath), (LPARAM)szCurrentProfilePath);
CallService(MS_DB_GETPROFILENAMET, _countof(szCurrentProfile), (LPARAM)szCurrentProfile);
- TCHAR *pos = _tcsrchr(szCurrentProfile, '.'); if (pos) *pos = 0;
+ wchar_t *pos = wcsrchr(szCurrentProfile, '.'); if (pos) *pos = 0;
GetModuleFileName(GetModuleHandleA("mir_app.mir"), szMirandaPath, _countof(szMirandaPath));
- pos = _tcsrchr(szMirandaPath, '\\'); if (pos) *pos = 0;
+ pos = wcsrchr(szMirandaPath, '\\'); if (pos) *pos = 0;
- TCHAR *szTemp = Utils_ReplaceVarsT(L"%miranda_userdata%");
+ wchar_t *szTemp = Utils_ReplaceVarsT(L"%miranda_userdata%");
mir_sntprintf(szUserDataPath, szTemp);
mir_free(szTemp);
|