From ee697e0b699bcefec907c089e3ad455538c72c2f Mon Sep 17 00:00:00 2001 From: Kirill Volinsky Date: Sun, 24 May 2015 12:35:03 +0000 Subject: replace wcscpy to mir_wstrcpy replace wcscat to mir_wstrcat replace wcsncat to mir_wstrncat replace wcscmp to mir_wstrcmp replace wcsicmp to mir_wstrcmpi git-svn-id: http://svn.miranda-ng.org/main/trunk@13814 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- src/modules/clist/contacts.cpp | 4 ++-- src/modules/protocols/protoaccs.cpp | 4 ++-- src/modules/utils/timezones.cpp | 2 +- src/modules/xml/xmlParser.cpp | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) (limited to 'src') diff --git a/src/modules/clist/contacts.cpp b/src/modules/clist/contacts.cpp index d6dc9d044d..497527bc8d 100644 --- a/src/modules/clist/contacts.cpp +++ b/src/modules/clist/contacts.cpp @@ -187,7 +187,7 @@ static INT_PTR GetContactInfo(WPARAM, LPARAM lParam) size_t len = mir_wstrlen(dbv.pwszVal) + mir_wstrlen(dbv2.pwszVal) + 2; WCHAR* buf = (WCHAR*)mir_alloc(sizeof(WCHAR)*len); if (buf != NULL) - wcscat(wcscat(wcscpy(buf, dbv.pwszVal), L" "), dbv2.pwszVal); + mir_wstrcat(mir_wstrcat(mir_wstrcpy(buf, dbv.pwszVal), L" "), dbv2.pwszVal); ci->pszVal = (TCHAR*)buf; } else { @@ -312,7 +312,7 @@ static INT_PTR GetContactInfo(WPARAM, LPARAM lParam) size_t len = mir_wstrlen(dbv.pwszVal) + mir_wstrlen(dbv2.pwszVal) + 2; WCHAR* buf = (WCHAR*)mir_alloc(sizeof(WCHAR)*len); if (buf != NULL) - wcscat(wcscat(wcscpy(buf, dbv.pwszVal), L" "), dbv2.pwszVal); + mir_wstrcat(mir_wstrcat(mir_wstrcpy(buf, dbv.pwszVal), L" "), dbv2.pwszVal); ci->pszVal = (TCHAR*)buf; } else { diff --git a/src/modules/protocols/protoaccs.cpp b/src/modules/protocols/protoaccs.cpp index 9dd7e5f9ee..4e863b235f 100644 --- a/src/modules/protocols/protoaccs.cpp +++ b/src/modules/protocols/protoaccs.cpp @@ -394,7 +394,7 @@ static INT_PTR stub43(PROTO_INTERFACE* ppi, WPARAM wParam, LPARAM lParam) p->format = tmp.format; wchar_t filename[MAX_PATH]; - wcscpy(filename, tmp.filename); + mir_wstrcpy(filename, tmp.filename); GetShortPathNameW(tmp.filename, filename, SIZEOF(filename)); WideCharToMultiByte(CP_ACP, 0, filename, -1, p->filename, MAX_PATH, 0, 0); @@ -407,7 +407,7 @@ static INT_PTR stub44(PROTO_INTERFACE* ppi, WPARAM wParam, LPARAM lParam) int result = CallProtoServiceInt(NULL, ppi->m_szModuleName, PS_GETMYAVATARW, WPARAM(buf), lParam); if (result == 0) { wchar_t* filename = (wchar_t*)_alloca(sizeof(wchar_t) * (lParam + 1)); - wcscpy(filename, buf); + mir_wstrcpy(filename, buf); GetShortPathNameW(buf, filename, lParam + 1); WideCharToMultiByte(CP_ACP, 0, filename, -1, (char*)wParam, lParam, 0, 0); diff --git a/src/modules/utils/timezones.cpp b/src/modules/utils/timezones.cpp index 435d358220..961d6e6661 100644 --- a/src/modules/utils/timezones.cpp +++ b/src/modules/utils/timezones.cpp @@ -480,7 +480,7 @@ extern "C" __declspec(dllexport) void RecalculateTime(void) tz.offset = INT_MIN; if (!found) { - if (!wcscmp(tz.tzi.StandardName, myInfo.myTZ.tzi.StandardName) || !wcscmp(tz.tzi.DaylightName, myInfo.myTZ.tzi.DaylightName)) { + if (!mir_wstrcmp(tz.tzi.StandardName, myInfo.myTZ.tzi.StandardName) || !mir_wstrcmp(tz.tzi.DaylightName, myInfo.myTZ.tzi.DaylightName)) { _tcsncpy_s(myInfo.myTZ.tszName, tz.tszName, _TRUNCATE); found = true; } diff --git a/src/modules/xml/xmlParser.cpp b/src/modules/xml/xmlParser.cpp index 885d6d81c1..eae664e888 100644 --- a/src/modules/xml/xmlParser.cpp +++ b/src/modules/xml/xmlParser.cpp @@ -207,7 +207,7 @@ static inline int xstrnicmp(XMLCSTR c1, XMLCSTR c2, int l) { return _wcsnicmp(c1 static inline int xstrncmp(XMLCSTR c1, XMLCSTR c2, int l) { return wcsncmp(c1, c2, l);} static inline int xstricmp(XMLCSTR c1, XMLCSTR c2) { return _wcsicmp(c1, c2); } static inline XMLSTR xstrstr(XMLCSTR c1, XMLCSTR c2) { return (XMLSTR)wcsstr(c1, c2); } -static inline XMLSTR xstrcpy(XMLSTR c1, XMLCSTR c2) { return (XMLSTR)wcscpy(c1, c2); } +static inline XMLSTR xstrcpy(XMLSTR c1, XMLCSTR c2) { return (XMLSTR)mir_wstrcpy(c1, c2); } #else char *myWideCharToMultiByte(const wchar_t *s) { @@ -313,7 +313,7 @@ static inline int xstrnicmp(XMLCSTR c1, XMLCSTR c2, int l) #endif #endif static inline XMLSTR xstrstr(XMLCSTR c1, XMLCSTR c2) { return (XMLSTR)wcsstr(c1, c2); } -static inline XMLSTR xstrcpy(XMLSTR c1, XMLCSTR c2) { return (XMLSTR)wcscpy(c1, c2); } +static inline XMLSTR xstrcpy(XMLSTR c1, XMLCSTR c2) { return (XMLSTR)mir_wstrcpy(c1, c2); } static inline FILE *xfopen(XMLCSTR filename, XMLCSTR mode) { char *filenameAscii = myWideCharToMultiByte(filename); -- cgit v1.2.3