From 45696cc867a3abdefbb695b2b81c2cf6847a31ac Mon Sep 17 00:00:00 2001 From: Kirill Volinsky Date: Fri, 24 Apr 2015 07:17:05 +0000 Subject: minor cleanup git-svn-id: http://svn.miranda-ng.org/main/trunk@13063 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/SplashScreen/src/debug.h | 6 +++--- plugins/SplashScreen/src/headers.h | 2 -- plugins/SplashScreen/src/main.cpp | 2 +- 3 files changed, 4 insertions(+), 6 deletions(-) (limited to 'plugins/SplashScreen/src') diff --git a/plugins/SplashScreen/src/debug.h b/plugins/SplashScreen/src/debug.h index 7d52037d34..62bcd37f80 100644 --- a/plugins/SplashScreen/src/debug.h +++ b/plugins/SplashScreen/src/debug.h @@ -24,10 +24,10 @@ int inline _DebugPopup(MCONTACT hContact, TCHAR *fmt, ...) ppd.lchContact = hContact; ppd.lchIcon = LoadSkinnedIcon(SKINICON_OTHER_MIRANDA); if(hContact != 0) - _tcsncpy_s(ppd.lptzContactName, (TCHAR*)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, hContact, GCDNF_TCHAR), MAX_CONTACTNAME); + mir_tstrncpy(ppd.lptzContactName, (TCHAR*)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, hContact, GCDNF_TCHAR), MAX_CONTACTNAME); else - _tcsncpy_s(ppd.lptzContactName, _T(PlugName), MAX_CONTACTNAME); - _tcsncpy_s(ppd.lptzText, debug, MAX_SECONDLINE - 20); + mir_tstrncpy(ppd.lptzContactName, _T(PlugName), MAX_CONTACTNAME); + mir_tstrncpy(ppd.lptzText, debug, MAX_SECONDLINE - 20); ppd.colorText = RGB(255,255,255); ppd.colorBack = RGB(255,0,0); PUAddPopupT(&ppd); diff --git a/plugins/SplashScreen/src/headers.h b/plugins/SplashScreen/src/headers.h index 9122a377e5..a1faad7f69 100644 --- a/plugins/SplashScreen/src/headers.h +++ b/plugins/SplashScreen/src/headers.h @@ -55,8 +55,6 @@ #define MODNAME "SplashScreen" #define WM_LOADED (WM_USER + 10) -#define tmemcpy wmemcpy - struct SPLASHOPTS { byte active; diff --git a/plugins/SplashScreen/src/main.cpp b/plugins/SplashScreen/src/main.cpp index b2c29a9d06..e8793501f4 100644 --- a/plugins/SplashScreen/src/main.cpp +++ b/plugins/SplashScreen/src/main.cpp @@ -196,7 +196,7 @@ void SplashMain() //files = new char[strlen(ffd.cFileName)]; //files[filescount] = new char[strlen(ffd.cFileName)]; TCHAR ext[5]; - tmemcpy(ext, ffd.cFileName + (mir_tstrlen(ffd.cFileName) - 4), 5); + wmemcpy(ext, ffd.cFileName + (mir_tstrlen(ffd.cFileName) - 4), 5); #ifdef _DEBUG logMessage(_T("Extention"), ext); -- cgit v1.2.3