diff options
| -rw-r--r-- | plugins/SplashScreen/src/debug.h | 6 | ||||
| -rw-r--r-- | plugins/SplashScreen/src/headers.h | 2 | ||||
| -rw-r--r-- | plugins/SplashScreen/src/main.cpp | 2 |
3 files changed, 4 insertions, 6 deletions
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);
|