From 2a815f8820ca402626bd283dd5b75744ddeb9812 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sat, 23 May 2015 18:55:59 +0000 Subject: mir_tstrncpy <> _tcsncpy git-svn-id: http://svn.miranda-ng.org/main/trunk@13791 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/TrafficCounter/src/TrafficCounter.cpp | 8 ++++---- plugins/TrafficCounter/src/misc.cpp | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'plugins/TrafficCounter') diff --git a/plugins/TrafficCounter/src/TrafficCounter.cpp b/plugins/TrafficCounter/src/TrafficCounter.cpp index c728572581..22caa0e3c2 100644 --- a/plugins/TrafficCounter/src/TrafficCounter.cpp +++ b/plugins/TrafficCounter/src/TrafficCounter.cpp @@ -455,10 +455,10 @@ int PaintTrafficCounterWindow(HWND hwnd, HDC hDC) rq.hDC = hdc; rq.rcDestRect = rect; rq.rcClipRect = rect; - mir_strncpy(rq.szObjectID, "Main,ID=EventArea", sizeof(rq.szObjectID)); + strncpy(rq.szObjectID, "Main,ID=EventArea", sizeof(rq.szObjectID)); if (CallService(MS_SKIN_DRAWGLYPH, (WPARAM)&rq, 0)) { - mir_strncpy(rq.szObjectID, "Main,ID=StatusBar", sizeof(rq.szObjectID)); + strncpy(rq.szObjectID, "Main,ID=StatusBar", sizeof(rq.szObjectID)); CallService(MS_SKIN_DRAWGLYPH, (WPARAM)&rq, 0); } } @@ -1136,7 +1136,7 @@ void NotifyOnSend(void) memset(&ppd, 0, sizeof(ppd)); ppd.lchContact = NULL; ppd.lchIcon = LoadSkinnedIcon(SKINICON_EVENT_MESSAGE); - mir_tstrncpy(ppd.lptzContactName, TranslateT("Traffic counter notification"), MAX_CONTACTNAME); + _tcsncpy(ppd.lptzContactName, TranslateT("Traffic counter notification"), MAX_CONTACTNAME); // mir_sntprintf(ppd.lptzText, SIZEOF(ppd.lptzText), TranslateT("%d kilobytes sent"), notify_send_size = OverallInfo.CurrentSentTraffic >> 10); @@ -1155,7 +1155,7 @@ void NotifyOnRecv(void) memset(&ppd, 0, sizeof(ppd)); ppd.lchContact = NULL; ppd.lchIcon = LoadSkinnedIcon(SKINICON_EVENT_MESSAGE); - mir_tstrncpy(ppd.lptzContactName, TranslateT("Traffic counter notification"),MAX_CONTACTNAME); + _tcsncpy(ppd.lptzContactName, TranslateT("Traffic counter notification"),MAX_CONTACTNAME); // mir_sntprintf(ppd.lptzText, SIZEOF(ppd.lptzText), TranslateT("%d kilobytes received"), notify_recv_size = OverallInfo.CurrentRecvTraffic >> 10); diff --git a/plugins/TrafficCounter/src/misc.cpp b/plugins/TrafficCounter/src/misc.cpp index 51fb9e96b9..196ec13abb 100644 --- a/plugins/TrafficCounter/src/misc.cpp +++ b/plugins/TrafficCounter/src/misc.cpp @@ -60,7 +60,7 @@ WORD GetRowItems(TCHAR *InputString, RowItemInfo **RowItemsList) // Выделяем память под строку. (*RowItemsList)[c].String = (TCHAR*)mir_alloc(sizeof(TCHAR) * (begin - end)); // Копируем строку. - mir_tstrncpy((*RowItemsList)[c].String, end + 1, begin - end - 1); + _tcsncpy((*RowItemsList)[c].String, end + 1, begin - end - 1); (*RowItemsList)[c].String[begin - end - 1] = 0; } else @@ -68,7 +68,7 @@ WORD GetRowItems(TCHAR *InputString, RowItemInfo **RowItemsList) // Выделяем память под строку. (*RowItemsList)[c].String = (TCHAR*)mir_alloc(sizeof(TCHAR) * mir_tstrlen(end)); // Копируем строку. - mir_tstrncpy((*RowItemsList)[c].String, end + 1, mir_tstrlen(end)); + _tcsncpy((*RowItemsList)[c].String, end + 1, mir_tstrlen(end)); } c++; @@ -264,7 +264,7 @@ size_t GetDurationFormatM(DWORD Duration, TCHAR *Format, TCHAR *Buffer, WORD Siz if (Size && Buffer) { - mir_tstrncpy(Buffer, Res, Size); + _tcsncpy(Buffer, Res, Size); Length = mir_tstrlen(Buffer); } else -- cgit v1.2.3