From c09aa99a7e9915c503064d6eb5e9dd1bdd2a673f Mon Sep 17 00:00:00 2001 From: Kirill Volinsky Date: Fri, 22 May 2015 20:07:58 +0000 Subject: replace _tcscpy to mir_tstrcpy git-svn-id: http://svn.miranda-ng.org/main/trunk@13764 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/JabberG/src/jabber_iqid.cpp | 2 +- protocols/JabberG/src/jabber_privacy.cpp | 2 +- protocols/JabberG/src/jabber_thread.cpp | 6 +++--- protocols/JabberG/src/jabber_vcard.cpp | 8 ++++---- protocols/JabberG/src/jabber_xstatus.cpp | 6 +++--- 5 files changed, 12 insertions(+), 12 deletions(-) (limited to 'protocols/JabberG') diff --git a/protocols/JabberG/src/jabber_iqid.cpp b/protocols/JabberG/src/jabber_iqid.cpp index 1fce21f81a..12a822279c 100644 --- a/protocols/JabberG/src/jabber_iqid.cpp +++ b/protocols/JabberG/src/jabber_iqid.cpp @@ -405,7 +405,7 @@ void CJabberProto::OnIqResultGetRoster(HXML iqNode, CJabberIqInfo *pInfo) *szPos = 0; szPos += mir_tstrlen(szGroupDelimeter); TCHAR *szNewGroup = (TCHAR *)mir_alloc(sizeof(TCHAR) * (mir_tstrlen(item->group) + mir_tstrlen(szPos) + 2)); - _tcscpy(szNewGroup, item->group); + mir_tstrcpy(szNewGroup, item->group); _tcscat(szNewGroup, _T("\\")); _tcscat(szNewGroup, szPos); mir_free(item->group); diff --git a/protocols/JabberG/src/jabber_privacy.cpp b/protocols/JabberG/src/jabber_privacy.cpp index 64b33c7916..1a38d4f043 100644 --- a/protocols/JabberG/src/jabber_privacy.cpp +++ b/protocols/JabberG/src/jabber_privacy.cpp @@ -1011,7 +1011,7 @@ void CJabberDlgPrivacyLists::ShowAdvancedList(CPrivacyList *pList) if (!dwPackets) dwPackets = JABBER_PL_RULE_TYPE_ALL; if (dwPackets == JABBER_PL_RULE_TYPE_ALL) - _tcscpy(szPackets, _T("all")); + mir_tstrcpy(szPackets, _T("all")); else { if (dwPackets & JABBER_PL_RULE_TYPE_MESSAGE) _tcscat(szPackets, _T("messages")); diff --git a/protocols/JabberG/src/jabber_thread.cpp b/protocols/JabberG/src/jabber_thread.cpp index 282f3f93bb..773dcb7800 100644 --- a/protocols/JabberG/src/jabber_thread.cpp +++ b/protocols/JabberG/src/jabber_thread.cpp @@ -280,13 +280,13 @@ LBL_FatalError: if (m_options.HostNameAsResource) { DWORD dwCompNameLen = SIZEOF(info.resource) - 1; if (!GetComputerName(info.resource, &dwCompNameLen)) - _tcscpy(info.resource, _T("Miranda")); + mir_tstrcpy(info.resource, _T("Miranda")); } else { if ((tszValue = getTStringA("Resource")) != NULL) _tcsncpy_s(info.resource, tszValue, _TRUNCATE); else - _tcscpy(info.resource, _T("Miranda")); + mir_tstrcpy(info.resource, _T("Miranda")); } TCHAR jidStr[512]; @@ -1266,7 +1266,7 @@ void CJabberProto::OnProcessMessage(HXML node, ThreadData *info) if (ptszUrl != NULL && *ptszUrl) { size_t cbLen = (szMessage ? mir_tstrlen(szMessage) : 0) + mir_tstrlen(ptszUrl) + 32; TCHAR *szTmp = (TCHAR *)alloca(sizeof(TCHAR)* cbLen); - _tcscpy(szTmp, ptszUrl); + mir_tstrcpy(szTmp, ptszUrl); if (szMessage) { _tcscat(szTmp, _T("\r\n")); _tcscat(szTmp, szMessage); diff --git a/protocols/JabberG/src/jabber_vcard.cpp b/protocols/JabberG/src/jabber_vcard.cpp index 2fd95e9f14..c5e7ba3036 100644 --- a/protocols/JabberG/src/jabber_vcard.cpp +++ b/protocols/JabberG/src/jabber_vcard.cpp @@ -291,13 +291,13 @@ static INT_PTR CALLBACK PhotoDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPAR dat->ppro->GetAvatarFileName(NULL, szAvatarFileName, SIZEOF(szAvatarFileName)); if (_taccess(szAvatarFileName, 0) == 0) { if (GetTempPath(SIZEOF(szTempPath), szTempPath) <= 0) - _tcscpy(szTempPath, _T(".\\")); + mir_tstrcpy(szTempPath, _T(".\\")); if (GetTempFileName(szTempPath, _T("jab"), 0, szTempFileName) > 0) { dat->ppro->debugLog(_T("Temp file = %s"), szTempFileName); if (CopyFile(szAvatarFileName, szTempFileName, FALSE) == TRUE) { if ((dat->hBitmap = (HBITMAP)CallService(MS_UTILS_LOADBITMAPT, 0, (LPARAM)szTempFileName)) != NULL) { FIP->FI_Premultiply(dat->hBitmap); - _tcscpy(dat->ppro->m_szPhotoFileName, szTempFileName); + mir_tstrcpy(dat->ppro->m_szPhotoFileName, szTempFileName); EnableWindow(GetDlgItem(hwndDlg, IDC_DELETE), TRUE); } else DeleteFile(szTempFileName); @@ -357,7 +357,7 @@ static INT_PTR CALLBACK PhotoDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPAR break; } if (GetTempPath(SIZEOF(szTempPath), szTempPath) <= 0) - _tcscpy(szTempPath, _T(".\\")); + mir_tstrcpy(szTempPath, _T(".\\")); if (GetTempFileName(szTempPath, _T("jab"), 0, szTempFileName) > 0) { dat->ppro->debugLog(_T("Temp file = %s"), szTempFileName); if (CopyFile(szFileName, szTempFileName, FALSE) == TRUE) { @@ -369,7 +369,7 @@ static INT_PTR CALLBACK PhotoDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPAR } dat->hBitmap = hNewBitmap; - _tcscpy(dat->ppro->m_szPhotoFileName, szTempFileName); + mir_tstrcpy(dat->ppro->m_szPhotoFileName, szTempFileName); dat->ppro->m_bPhotoChanged = TRUE; EnableWindow(GetDlgItem(hwndDlg, IDC_DELETE), TRUE); InvalidateRect(hwndDlg, NULL, TRUE); diff --git a/protocols/JabberG/src/jabber_xstatus.cpp b/protocols/JabberG/src/jabber_xstatus.cpp index 0bbcf35434..49f1bd03a5 100644 --- a/protocols/JabberG/src/jabber_xstatus.cpp +++ b/protocols/JabberG/src/jabber_xstatus.cpp @@ -1511,15 +1511,15 @@ void g_XstatusIconsInit() TCHAR szFile[MAX_PATH]; GetModuleFileName(hInst, szFile, SIZEOF(szFile)); if (TCHAR *p = _tcsrchr(szFile, '\\')) - _tcscpy(p + 1, _T("..\\Icons\\xstatus_jabber.dll")); + mir_tstrcpy(p + 1, _T("..\\Icons\\xstatus_jabber.dll")); TCHAR szSection[100]; - _tcscpy(szSection, _T("Protocols/Jabber/")LPGENT("Moods")); + mir_tstrcpy(szSection, _T("Protocols/Jabber/")LPGENT("Moods")); for (int i = 1; i < SIZEOF(g_arrMoods); i++) g_MoodIcons.RegisterIcon(g_arrMoods[i].szTag, szFile, -(200 + i), szSection, TranslateTS(g_arrMoods[i].szName)); - _tcscpy(szSection, _T("Protocols/Jabber/")LPGENT("Activities")); + mir_tstrcpy(szSection, _T("Protocols/Jabber/")LPGENT("Activities")); for (int k = 0; k < SIZEOF(g_arrActivities); k++) { if (g_arrActivities[k].szFirst) g_ActivityIcons.RegisterIcon(g_arrActivities[k].szFirst, szFile, g_arrActivities[k].iconid, szSection, TranslateTS(g_arrActivities[k].szTitle)); -- cgit v1.2.3