From 81c71c6c4cf85e8a7575bdf5a8f7991df1eec8b7 Mon Sep 17 00:00:00 2001 From: Kirill Volinsky Date: Sat, 23 May 2015 17:17:58 +0000 Subject: replace _tcsncat to mir_tstrncat git-svn-id: http://svn.miranda-ng.org/main/trunk@13781 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/Clist_nicer/src/viewmodes.cpp | 4 +- plugins/Exchange/src/MirandaExchange.cpp | 2 +- plugins/HTTPServer/src/main.cpp | 2 +- plugins/IEView/src/ScriverHTMLBuilder.cpp | 2 +- plugins/MenuItemEx/src/main.cpp | 8 +-- plugins/NewEventNotify/src/popup.cpp | 2 +- plugins/New_GPG/src/main.cpp | 10 +-- plugins/New_GPG/src/options.cpp | 4 +- plugins/New_GPG/src/utilities.cpp | 4 +- plugins/Scriver/src/msglog.cpp | 2 +- plugins/SeenPlugin/src/missed.cpp | 2 +- plugins/SeenPlugin/src/utils.cpp | 8 +-- plugins/StatusPlugins/KeepStatus/keepstatus.cpp | 2 +- plugins/TabSRMM/src/eventpopups.cpp | 6 +- plugins/Variables/src/parse_system.cpp | 6 +- plugins/Weather/src/weather_contacts.cpp | 4 +- plugins/Weather/src/weather_info.cpp | 82 ++++++++++++------------- plugins/Weather/src/weather_ini.cpp | 6 +- plugins/Weather/src/weather_popup.cpp | 6 +- plugins/Weather/src/weather_update.cpp | 8 +-- protocols/Gadu-Gadu/src/core.cpp | 4 +- protocols/Gadu-Gadu/src/import.cpp | 10 +-- protocols/JabberG/src/jabber_adhoc.cpp | 4 +- src/modules/utils/bmpfilter.cpp | 12 ++-- 24 files changed, 100 insertions(+), 100 deletions(-) diff --git a/plugins/Clist_nicer/src/viewmodes.cpp b/plugins/Clist_nicer/src/viewmodes.cpp index d3d6518959..d18dddb6d1 100644 --- a/plugins/Clist_nicer/src/viewmodes.cpp +++ b/plugins/Clist_nicer/src/viewmodes.cpp @@ -367,8 +367,8 @@ void SaveState() item.cchTextMax = SIZEOF(szTemp); item.iItem = i; SendMessage(hwndList, LVM_GETITEM, 0, (LPARAM)&item); - _tcsncat(newGroupFilter, szTemp, SIZEOF(newGroupFilter) - mir_tstrlen(newGroupFilter)); - _tcsncat(newGroupFilter, _T("|"), SIZEOF(newGroupFilter) - mir_tstrlen(newGroupFilter)); + mir_tstrncat(newGroupFilter, szTemp, SIZEOF(newGroupFilter) - mir_tstrlen(newGroupFilter)); + mir_tstrncat(newGroupFilter, _T("|"), SIZEOF(newGroupFilter) - mir_tstrlen(newGroupFilter)); newGroupFilter[2047] = 0; } } diff --git a/plugins/Exchange/src/MirandaExchange.cpp b/plugins/Exchange/src/MirandaExchange.cpp index b39622b35c..52a21e8a18 100644 --- a/plugins/Exchange/src/MirandaExchange.cpp +++ b/plugins/Exchange/src/MirandaExchange.cpp @@ -436,7 +436,7 @@ HRESULT CMirandaExchange::InitializeAndLogin( LPCTSTR szUsername, LPCTSTR szPass _tstrtime(szPID); _tcsncpy(szPIDandName, m_szUsername, SIZEOF(szPIDandName)-1); - _tcsncat(szPIDandName, szPID, SIZEOF(szPIDandName) - mir_tstrlen(szPIDandName)); + mir_tstrncat(szPIDandName, szPID, SIZEOF(szPIDandName) - mir_tstrlen(szPIDandName)); hr = CreateProfile(szPIDandName); if ( HR_FAILED(hr)) { diff --git a/plugins/HTTPServer/src/main.cpp b/plugins/HTTPServer/src/main.cpp index 9d596d3b10..f63d31db5a 100644 --- a/plugins/HTTPServer/src/main.cpp +++ b/plugins/HTTPServer/src/main.cpp @@ -900,7 +900,7 @@ int nSystemShutdown(WPARAM /*wparam*/, LPARAM /*lparam*/) { MessageBox(NULL, _T("Failed to retrieve plugin path."), MSG_BOX_TITEL, MB_OK); return 1; } - _tcsncat(szPluginPath, _T("\\HTTPServer\\"), SIZEOF(szPluginPath) - mir_tstrlen(szPluginPath)); + mir_tstrncat(szPluginPath, _T("\\HTTPServer\\"), SIZEOF(szPluginPath) - mir_tstrlen(szPluginPath)); int err = CreateDirectoryTree(szPluginPath); if((err != 0) && (err != ERROR_ALREADY_EXISTS)) { diff --git a/plugins/IEView/src/ScriverHTMLBuilder.cpp b/plugins/IEView/src/ScriverHTMLBuilder.cpp index fec5fa0aaf..8d9e6aa737 100644 --- a/plugins/IEView/src/ScriverHTMLBuilder.cpp +++ b/plugins/IEView/src/ScriverHTMLBuilder.cpp @@ -171,7 +171,7 @@ char *ScriverHTMLBuilder::timestampToString(DWORD dwFlags, time_t check, int mod if (format[0] != '\0') { // CallService(MS_DB_TIME_TIMESTAMPTOSTRINGT, check, (LPARAM) & dbtts); CallService(MS_DB_TIME_TIMESTAMPTOSTRING, check, (LPARAM)& dbtts); - //_tcsncat(szResult, str, 500); + //mir_tstrncat(szResult, str, 500); mir_strncat(szResult, str, SIZEOF(szResult) - mir_strlen(szResult)); } mir_strncpy(szResult, ptrA(mir_utf8encode(szResult)), 500); diff --git a/plugins/MenuItemEx/src/main.cpp b/plugins/MenuItemEx/src/main.cpp index d8e9075956..91631104cf 100644 --- a/plugins/MenuItemEx/src/main.cpp +++ b/plugins/MenuItemEx/src/main.cpp @@ -638,11 +638,11 @@ INT_PTR onCopyStatusMsg(WPARAM wparam, LPARAM lparam) if (msg) { if (_tcsclen(msg)) { if (flags & VF_SMNAME) { - _tcsncat(buffer, TranslateTS(statusMsg[i].fullName), (SIZEOF(buffer) - _tcsclen(buffer) - 1)); - _tcsncat(buffer, _T(": "), (SIZEOF(buffer) - _tcsclen(buffer) - 1)); + mir_tstrncat(buffer, TranslateTS(statusMsg[i].fullName), (SIZEOF(buffer) - _tcsclen(buffer) - 1)); + mir_tstrncat(buffer, _T(": "), (SIZEOF(buffer) - _tcsclen(buffer) - 1)); } - _tcsncat(buffer, msg, (SIZEOF(buffer) - _tcsclen(buffer) - 1)); - _tcsncat(buffer, _T("\r\n"), (SIZEOF(buffer) - _tcsclen(buffer) - 1)); + mir_tstrncat(buffer, msg, (SIZEOF(buffer) - _tcsclen(buffer) - 1)); + mir_tstrncat(buffer, _T("\r\n"), (SIZEOF(buffer) - _tcsclen(buffer) - 1)); } mir_free(msg); } diff --git a/plugins/NewEventNotify/src/popup.cpp b/plugins/NewEventNotify/src/popup.cpp index 784cbb31a7..26abadd88b 100644 --- a/plugins/NewEventNotify/src/popup.cpp +++ b/plugins/NewEventNotify/src/popup.cpp @@ -575,7 +575,7 @@ int PopupUpdate(MCONTACT hContact, MEVENT hEvent) if (pdata->pluginOptions->bShowDate) _tcsncpy(formatTime, _T("%Y.%m.%d"), SIZEOF(formatTime)); else if (pdata->pluginOptions->bShowTime) - _tcsncat(formatTime, _T(" %H:%M"), SIZEOF(formatTime) - mir_tstrlen(formatTime)); + mir_tstrncat(formatTime, _T(" %H:%M"), SIZEOF(formatTime) - mir_tstrlen(formatTime)); time_t localTime = dbe.timestamp; _tcsftime(timestamp, SIZEOF(timestamp), formatTime, localtime(&localTime)); mir_sntprintf(lpzText, SIZEOF(lpzText), _T("%s[b][i]%s[/i][/b]\n"), lpzText, timestamp); diff --git a/plugins/New_GPG/src/main.cpp b/plugins/New_GPG/src/main.cpp index 28750225be..872fa7b141 100755 --- a/plugins/New_GPG/src/main.cpp +++ b/plugins/New_GPG/src/main.cpp @@ -2051,10 +2051,10 @@ void InitCheck() { TCHAR buf[4096]; _tcsncpy(buf, gpg_valid?TranslateT("GPG binary is set and valid (this is good).\n"):TranslateT("GPG binary unset or invalid (plugin will not work).\n"), SIZEOF(buf)); - _tcsncat(buf, home_dir_access?TranslateT("Home dir write access granted (this is good).\n"):TranslateT("Home dir has no write access (plugin most probably will not work).\n"), SIZEOF(buf) - mir_tstrlen(buf)); - _tcsncat(buf, temp_access?TranslateT("Temp dir write access granted (this is good).\n"):TranslateT("Temp dir has no write access (plugin should work, but may have some problems, file transfers will not work)."), SIZEOF(buf) - mir_tstrlen(buf)); + mir_tstrncat(buf, home_dir_access?TranslateT("Home dir write access granted (this is good).\n"):TranslateT("Home dir has no write access (plugin most probably will not work).\n"), SIZEOF(buf) - mir_tstrlen(buf)); + mir_tstrncat(buf, temp_access?TranslateT("Temp dir write access granted (this is good).\n"):TranslateT("Temp dir has no write access (plugin should work, but may have some problems, file transfers will not work)."), SIZEOF(buf) - mir_tstrlen(buf)); if(!gpg_valid) - _tcsncat(buf, TranslateT("\nGPG will be disabled until you solve these problems"), SIZEOF(buf) - mir_tstrlen(buf)); + mir_tstrncat(buf, TranslateT("\nGPG will be disabled until you solve these problems"), SIZEOF(buf) - mir_tstrlen(buf)); MessageBox(0, buf, TranslateT("GPG plugin problems"), MB_OK); } if(!gpg_valid) @@ -2304,8 +2304,8 @@ void ImportKey() ptmp = UniGetContactSettingUtf(NULL, szGPGModuleName, "szHomePath", _T("")); _tcsncpy(tmp2, ptmp, MAX_PATH-1); mir_free(ptmp); - _tcsncat(tmp2, _T("\\"), SIZEOF(tmp2) - mir_tstrlen(tmp2)); - _tcsncat(tmp2, _T("temporary_exported.asc"), SIZEOF(tmp2) - mir_tstrlen(tmp2)); + mir_tstrncat(tmp2, _T("\\"), SIZEOF(tmp2) - mir_tstrlen(tmp2)); + mir_tstrncat(tmp2, _T("temporary_exported.asc"), SIZEOF(tmp2) - mir_tstrlen(tmp2)); boost::filesystem::remove(tmp2); wfstream f(tmp2, std::ios::out); if(db_mc_isMeta(hContact)) diff --git a/plugins/New_GPG/src/options.cpp b/plugins/New_GPG/src/options.cpp index 392aceb8f1..3973d1cd39 100755 --- a/plugins/New_GPG/src/options.cpp +++ b/plugins/New_GPG/src/options.cpp @@ -905,8 +905,8 @@ static INT_PTR CALLBACK DlgProcLoadPublicKey(HWND hwndDlg,UINT msg,WPARAM wParam ptmp = UniGetContactSettingUtf(NULL, szGPGModuleName, "szHomePath", _T("")); _tcsncpy(tmp2, ptmp, MAX_PATH-1); mir_free(ptmp); - _tcsncat(tmp2, _T("\\"), SIZEOF(tmp2) - mir_tstrlen(tmp2)); - _tcsncat(tmp2, _T("temporary_exported.asc"), SIZEOF(tmp2) - mir_tstrlen(tmp2)); + mir_tstrncat(tmp2, _T("\\"), SIZEOF(tmp2) - mir_tstrlen(tmp2)); + mir_tstrncat(tmp2, _T("temporary_exported.asc"), SIZEOF(tmp2) - mir_tstrlen(tmp2)); boost::filesystem::remove(tmp2); wfstream f(tmp2, std::ios::out); ptmp = UniGetContactSettingUtf(hcnt, szGPGModuleName, "GPGPubKey", _T("")); diff --git a/plugins/New_GPG/src/utilities.cpp b/plugins/New_GPG/src/utilities.cpp index d89a78cb8f..a4d4077ac8 100755 --- a/plugins/New_GPG/src/utilities.cpp +++ b/plugins/New_GPG/src/utilities.cpp @@ -1861,8 +1861,8 @@ INT_PTR ImportGpGKeys(WPARAM w, LPARAM l) ptmp = UniGetContactSettingUtf(NULL, szGPGModuleName, "szHomePath", _T("")); _tcsncpy(tmp2, ptmp, MAX_PATH-1); mir_free(ptmp); - _tcsncat(tmp2, _T("\\"), SIZEOF(tmp2) - mir_tstrlen(tmp2)); - _tcsncat(tmp2, _T("temporary_exported.asc"), SIZEOF(tmp2) - mir_tstrlen(tmp2)); + mir_tstrncat(tmp2, _T("\\"), SIZEOF(tmp2) - mir_tstrlen(tmp2)); + mir_tstrncat(tmp2, _T("temporary_exported.asc"), SIZEOF(tmp2) - mir_tstrlen(tmp2)); boost::filesystem::remove(tmp2); wfstream f(tmp2, std::ios::out); f<tszAccName) > 0 && mir_strlen(ps[i]->szName) > 0) { if (db_get_b(NULL, MODULENAME, SETTING_PUSHOWEXTRA, TRUE)) { mir_sntprintf(protoInfoLine, SIZEOF(protoInfoLine), TranslateT("%s\t(will be set to %s)\r\n"), ps[i]->tszAccName, pcli->pfnGetStatusModeDescription(ps[i]->status, GSMDF_TCHAR)); - _tcsncat(protoInfo, protoInfoLine, SIZEOF(protoInfo) - mir_tstrlen(protoInfo) - 1); + mir_tstrncat(protoInfo, protoInfoLine, SIZEOF(protoInfo) - mir_tstrlen(protoInfo) - 1); } } } diff --git a/plugins/TabSRMM/src/eventpopups.cpp b/plugins/TabSRMM/src/eventpopups.cpp index 79391db987..f7d9d81686 100644 --- a/plugins/TabSRMM/src/eventpopups.cpp +++ b/plugins/TabSRMM/src/eventpopups.cpp @@ -517,10 +517,10 @@ static int PopupUpdateT(MCONTACT hContact, MEVENT hEvent) TCHAR *szPreview = GetPreviewT(dbe.eventType, &dbe); if (szPreview) { - _tcsncat(pdata->eventData[pdata->nrMerged].tszText, szPreview, SIZEOF(pdata->eventData[pdata->nrMerged].tszText) - mir_tstrlen(pdata->eventData[pdata->nrMerged].tszText)); + mir_tstrncat(pdata->eventData[pdata->nrMerged].tszText, szPreview, SIZEOF(pdata->eventData[pdata->nrMerged].tszText) - mir_tstrlen(pdata->eventData[pdata->nrMerged].tszText)); mir_free(szPreview); } - else _tcsncat(pdata->eventData[pdata->nrMerged].tszText, _T(" "), SIZEOF(pdata->eventData[pdata->nrMerged].tszText) - mir_tstrlen(pdata->eventData[pdata->nrMerged].tszText)); + else mir_tstrncat(pdata->eventData[pdata->nrMerged].tszText, _T(" "), SIZEOF(pdata->eventData[pdata->nrMerged].tszText) - mir_tstrlen(pdata->eventData[pdata->nrMerged].tszText)); pdata->eventData[pdata->nrMerged].tszText[MAX_SECONDLINE - 1] = 0; @@ -544,7 +544,7 @@ static int PopupUpdateT(MCONTACT hContact, MEVENT hEvent) } i = (available > 0) ? i + 1 : i + 2; for (; i <= pdata->nrMerged; i++) - _tcsncat(lpzText, pdata->eventData[i].tszText, SIZEOF(lpzText) - mir_tstrlen(lpzText)); + mir_tstrncat(lpzText, pdata->eventData[i].tszText, SIZEOF(lpzText) - mir_tstrlen(lpzText)); pdata->eventData[pdata->nrMerged].hEvent = hEvent; pdata->eventData[pdata->nrMerged].timestamp = dbe.timestamp; diff --git a/plugins/Variables/src/parse_system.cpp b/plugins/Variables/src/parse_system.cpp index 801de2637b..73c83cf22e 100644 --- a/plugins/Variables/src/parse_system.cpp +++ b/plugins/Variables/src/parse_system.cpp @@ -387,10 +387,10 @@ static TCHAR *parseListDir(ARGUMENTSINFO *ai) bFiles = FALSE; } if (tszFirst[mir_tstrlen(tszFirst) - 1] == '\\') - _tcsncat(tszFirst, tszFilter, SIZEOF(tszFirst) - mir_tstrlen(tszFirst) - 1); + mir_tstrncat(tszFirst, tszFilter, SIZEOF(tszFirst) - mir_tstrlen(tszFirst) - 1); else { - _tcsncat(tszFirst, _T("\\"), SIZEOF(tszFirst) - mir_tstrlen(tszFirst) - 1); - _tcsncat(tszFirst, tszFilter, SIZEOF(tszFirst) - mir_tstrlen(tszFirst) - 1); + mir_tstrncat(tszFirst, _T("\\"), SIZEOF(tszFirst) - mir_tstrlen(tszFirst) - 1); + mir_tstrncat(tszFirst, tszFilter, SIZEOF(tszFirst) - mir_tstrlen(tszFirst) - 1); } WIN32_FIND_DATA ffd; diff --git a/plugins/Weather/src/weather_contacts.cpp b/plugins/Weather/src/weather_contacts.cpp index 669a9bf560..5eec260dd7 100644 --- a/plugins/Weather/src/weather_contacts.cpp +++ b/plugins/Weather/src/weather_contacts.cpp @@ -294,12 +294,12 @@ INT_PTR CALLBACK DlgProcChange(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPa ofn.nMaxFile = SIZEOF(str); // set filters _tcsncpy(filter, TranslateT("Text Files"), SIZEOF(filter) - 1); - _tcsncat(filter, _T(" (*.txt)"), SIZEOF(filter) - mir_tstrlen(filter)); + mir_tstrncat(filter, _T(" (*.txt)"), SIZEOF(filter) - mir_tstrlen(filter)); pfilter = filter + mir_tstrlen(filter)+1; _tcsncpy(pfilter, _T("*.txt"), SIZEOF(filter) - 1); pfilter = pfilter + mir_tstrlen(pfilter)+1; _tcsncpy(pfilter, TranslateT("All Files"), SIZEOF(filter) - 1); - _tcsncat(pfilter, _T(" (*.*)"), SIZEOF(filter) - mir_tstrlen(filter)); + mir_tstrncat(pfilter, _T(" (*.*)"), SIZEOF(filter) - mir_tstrlen(filter)); pfilter = pfilter + mir_tstrlen(pfilter)+1; _tcsncpy(pfilter, _T("*.*"), SIZEOF(filter) - 1); pfilter = pfilter + mir_tstrlen(pfilter)+1; diff --git a/plugins/Weather/src/weather_info.cpp b/plugins/Weather/src/weather_info.cpp index 055308f903..39e41637c7 100644 --- a/plugins/Weather/src/weather_info.cpp +++ b/plugins/Weather/src/weather_info.cpp @@ -159,48 +159,48 @@ void GetINIInfo(TCHAR *pszSvc) else { mir_sntprintf(str2, SIZEOF(str2), TranslateT("Weather INI information for \"%s\":"), pszSvc); - _tcsncat(str2, _T("\n\n"), SIZEOF(str2) - mir_tstrlen(str2)); - _tcsncat(str2, TranslateT("Name:"), SIZEOF(str2) - mir_tstrlen(str2)); - _tcsncat(str2, _T("\t\t"), SIZEOF(str2) - mir_tstrlen(str2)); - _tcsncat(str2, sData->DisplayName, SIZEOF(str2) - mir_tstrlen(str2)); - _tcsncat(str2, _T("\n"), SIZEOF(str2) - mir_tstrlen(str2)); - _tcsncat(str2, TranslateT("Internal Name:"), SIZEOF(str2) - mir_tstrlen(str2)); - _tcsncat(str2, _T("\t"), SIZEOF(str2) - mir_tstrlen(str2)); - _tcsncat(str2, sData->InternalName, SIZEOF(str2) - mir_tstrlen(str2)); - _tcsncat(str2, _T("\n"), SIZEOF(str2) - mir_tstrlen(str2)); - _tcsncat(str2, TranslateT("Author:"), SIZEOF(str2) - mir_tstrlen(str2)); - _tcsncat(str2, _T("\t\t"), SIZEOF(str2) - mir_tstrlen(str2)); - _tcsncat(str2, sData->Author, SIZEOF(str2) - mir_tstrlen(str2)); - _tcsncat(str2, _T("\n"), SIZEOF(str2) - mir_tstrlen(str2)); - _tcsncat(str2, TranslateT("Version:"), SIZEOF(str2) - mir_tstrlen(str2)); - _tcsncat(str2, _T("\t\t"), SIZEOF(str2) - mir_tstrlen(str2)); - _tcsncat(str2, sData->Version, SIZEOF(str2) - mir_tstrlen(str2)); - _tcsncat(str2, _T("\n"), SIZEOF(str2) - mir_tstrlen(str2)); - _tcsncat(str2, TranslateT("INI Version:"), SIZEOF(str2) - mir_tstrlen(str2)); - _tcsncat(str2, _T("\t"), SIZEOF(str2) - mir_tstrlen(str2)); + mir_tstrncat(str2, _T("\n\n"), SIZEOF(str2) - mir_tstrlen(str2)); + mir_tstrncat(str2, TranslateT("Name:"), SIZEOF(str2) - mir_tstrlen(str2)); + mir_tstrncat(str2, _T("\t\t"), SIZEOF(str2) - mir_tstrlen(str2)); + mir_tstrncat(str2, sData->DisplayName, SIZEOF(str2) - mir_tstrlen(str2)); + mir_tstrncat(str2, _T("\n"), SIZEOF(str2) - mir_tstrlen(str2)); + mir_tstrncat(str2, TranslateT("Internal Name:"), SIZEOF(str2) - mir_tstrlen(str2)); + mir_tstrncat(str2, _T("\t"), SIZEOF(str2) - mir_tstrlen(str2)); + mir_tstrncat(str2, sData->InternalName, SIZEOF(str2) - mir_tstrlen(str2)); + mir_tstrncat(str2, _T("\n"), SIZEOF(str2) - mir_tstrlen(str2)); + mir_tstrncat(str2, TranslateT("Author:"), SIZEOF(str2) - mir_tstrlen(str2)); + mir_tstrncat(str2, _T("\t\t"), SIZEOF(str2) - mir_tstrlen(str2)); + mir_tstrncat(str2, sData->Author, SIZEOF(str2) - mir_tstrlen(str2)); + mir_tstrncat(str2, _T("\n"), SIZEOF(str2) - mir_tstrlen(str2)); + mir_tstrncat(str2, TranslateT("Version:"), SIZEOF(str2) - mir_tstrlen(str2)); + mir_tstrncat(str2, _T("\t\t"), SIZEOF(str2) - mir_tstrlen(str2)); + mir_tstrncat(str2, sData->Version, SIZEOF(str2) - mir_tstrlen(str2)); + mir_tstrncat(str2, _T("\n"), SIZEOF(str2) - mir_tstrlen(str2)); + mir_tstrncat(str2, TranslateT("INI Version:"), SIZEOF(str2) - mir_tstrlen(str2)); + mir_tstrncat(str2, _T("\t"), SIZEOF(str2) - mir_tstrlen(str2)); switch (sData->InternalVer) { - case 1: _tcsncat(str2, _T("1.0"), SIZEOF(str2) - mir_tstrlen(str2)); break; - case 2: _tcsncat(str2, _T("1.1"), SIZEOF(str2) - mir_tstrlen(str2)); break; - case 3: _tcsncat(str2, _T("1.1a"), SIZEOF(str2) - mir_tstrlen(str2)); break; - case 4: _tcsncat(str2, _T("1.2"), SIZEOF(str2) - mir_tstrlen(str2)); break; - case 5: _tcsncat(str2, _T("1.3"), SIZEOF(str2) - mir_tstrlen(str2)); break; - case 6: _tcsncat(str2, _T("1.4"), SIZEOF(str2) - mir_tstrlen(str2)); break; - case 7: _tcsncat(str2, _T("1.5"), SIZEOF(str2) - mir_tstrlen(str2)); break; + case 1: mir_tstrncat(str2, _T("1.0"), SIZEOF(str2) - mir_tstrlen(str2)); break; + case 2: mir_tstrncat(str2, _T("1.1"), SIZEOF(str2) - mir_tstrlen(str2)); break; + case 3: mir_tstrncat(str2, _T("1.1a"), SIZEOF(str2) - mir_tstrlen(str2)); break; + case 4: mir_tstrncat(str2, _T("1.2"), SIZEOF(str2) - mir_tstrlen(str2)); break; + case 5: mir_tstrncat(str2, _T("1.3"), SIZEOF(str2) - mir_tstrlen(str2)); break; + case 6: mir_tstrncat(str2, _T("1.4"), SIZEOF(str2) - mir_tstrlen(str2)); break; + case 7: mir_tstrncat(str2, _T("1.5"), SIZEOF(str2) - mir_tstrlen(str2)); break; } - _tcsncat(str2, _T("\n"), SIZEOF(str2) - mir_tstrlen(str2)); - _tcsncat(str2, TranslateT("File Name:"), SIZEOF(str2) - mir_tstrlen(str2)); - _tcsncat(str2, _T("\t"), SIZEOF(str2) - mir_tstrlen(str2)); - _tcsncat(str2, sData->ShortFileName, SIZEOF(str2) - mir_tstrlen(str2)); - _tcsncat(str2, _T("\n"), SIZEOF(str2) - mir_tstrlen(str2)); - _tcsncat(str2, TranslateT("Item Count:"), SIZEOF(str2) - mir_tstrlen(str2)); + mir_tstrncat(str2, _T("\n"), SIZEOF(str2) - mir_tstrlen(str2)); + mir_tstrncat(str2, TranslateT("File Name:"), SIZEOF(str2) - mir_tstrlen(str2)); + mir_tstrncat(str2, _T("\t"), SIZEOF(str2) - mir_tstrlen(str2)); + mir_tstrncat(str2, sData->ShortFileName, SIZEOF(str2) - mir_tstrlen(str2)); + mir_tstrncat(str2, _T("\n"), SIZEOF(str2) - mir_tstrlen(str2)); + mir_tstrncat(str2, TranslateT("Item Count:"), SIZEOF(str2) - mir_tstrlen(str2)); mir_sntprintf(str2, SIZEOF(str2), _T("%s\t%i\n"), str2, sData->UpdateDataCount); - _tcsncat(str2, TranslateT("Memory Used:"), SIZEOF(str2) - mir_tstrlen(str2)); + mir_tstrncat(str2, TranslateT("Memory Used:"), SIZEOF(str2) - mir_tstrlen(str2)); mir_sntprintf(str2, SIZEOF(str2), _T("%s\t%i "), str2, sData->MemUsed); - _tcsncat(str2, TranslateT("bytes"), SIZEOF(str2) - mir_tstrlen(str2)); - _tcsncat(str2, _T("\n\n"), SIZEOF(str2) - mir_tstrlen(str2)); - _tcsncat(str2, TranslateT("Description:"), SIZEOF(str2) - mir_tstrlen(str2)); - _tcsncat(str2, _T("\n"), SIZEOF(str2) - mir_tstrlen(str2)); - _tcsncat(str2, sData->Description, SIZEOF(str2) - mir_tstrlen(str2)); + mir_tstrncat(str2, TranslateT("bytes"), SIZEOF(str2) - mir_tstrlen(str2)); + mir_tstrncat(str2, _T("\n\n"), SIZEOF(str2) - mir_tstrlen(str2)); + mir_tstrncat(str2, TranslateT("Description:"), SIZEOF(str2) - mir_tstrlen(str2)); + mir_tstrncat(str2, _T("\n"), SIZEOF(str2) - mir_tstrlen(str2)); + mir_tstrncat(str2, sData->Description, SIZEOF(str2) - mir_tstrlen(str2)); // display the message box and quit MessageBox(NULL, str2, TranslateT("Weather INI information"), MB_OK|MB_ICONINFORMATION); @@ -217,7 +217,7 @@ void MoreVarList(void) // heading _tcsncpy(str, VARS_LIST, SIZEOF(str) - 1); - _tcsncat(str, _T("\n\n"), SIZEOF(str) - mir_tstrlen(str)); + mir_tstrncat(str, _T("\n\n"), SIZEOF(str) - mir_tstrlen(str)); // loop through all weather services to find custom variables for (WIDATALIST *Item = WIHead;Item != NULL;Item = Item->next) { @@ -231,8 +231,8 @@ void MoreVarList(void) TCHAR* find = _tcsstr(str, tempstr); // if the custom variable does not exist in the list, add it to the list if (find == NULL) { - _tcsncat(str, tempstr, SIZEOF(str) - mir_tstrlen(str)); - _tcsncat(str, _T(", "), SIZEOF(str) - mir_tstrlen(str)); + mir_tstrncat(str, tempstr, SIZEOF(str) - mir_tstrlen(str)); + mir_tstrncat(str, _T(", "), SIZEOF(str) - mir_tstrlen(str)); } } } diff --git a/plugins/Weather/src/weather_ini.cpp b/plugins/Weather/src/weather_ini.cpp index 41eb87c70d..9e636102dd 100644 --- a/plugins/Weather/src/weather_ini.cpp +++ b/plugins/Weather/src/weather_ini.cpp @@ -183,7 +183,7 @@ bool LoadWIData(bool dial) if (chop == NULL) return false; *chop = '\0'; - _tcsncat(szSearchPath, _T("\\Plugins\\Weather\\*.ini"), SIZEOF(szSearchPath) - mir_tstrlen(szSearchPath)); + mir_tstrncat(szSearchPath, _T("\\Plugins\\Weather\\*.ini"), SIZEOF(szSearchPath) - mir_tstrlen(szSearchPath)); _tcsncpy(FileName, szSearchPath, MAX_PATH - 1); WIN32_FIND_DATA fd; @@ -195,7 +195,7 @@ bool LoadWIData(bool dial) do { chop = _tcsrchr(FileName, '\\'); chop[1] = '\0'; - _tcsncat(FileName, fd.cFileName, SIZEOF(FileName) - mir_tstrlen(FileName)); + mir_tstrncat(FileName, fd.cFileName, SIZEOF(FileName) - mir_tstrlen(FileName)); if ( mir_tstrcmpi(fd.cFileName, _T("SAMPLE_INI.INI"))) { WIDATA Data; LoadStationData(FileName, fd.cFileName, &Data); @@ -567,7 +567,7 @@ INT_PTR CALLBACK DlgProcSetup(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPar TCHAR *chop = _tcsrchr(szPath, '\\'); if (chop) { *chop = '\0'; - _tcsncat(szPath, _T("\\Plugins\\weather\\"), SIZEOF(szPath) - mir_tstrlen(szPath)); + mir_tstrncat(szPath, _T("\\Plugins\\weather\\"), SIZEOF(szPath) - mir_tstrlen(szPath)); _tmkdir(szPath); ShellExecute((HWND)lParam, _T("open"), szPath, _T(""), _T(""), SW_SHOW); } diff --git a/plugins/Weather/src/weather_popup.cpp b/plugins/Weather/src/weather_popup.cpp index b7ca1555cd..17ab3696c8 100644 --- a/plugins/Weather/src/weather_popup.cpp +++ b/plugins/Weather/src/weather_popup.cpp @@ -397,9 +397,9 @@ INT_PTR CALLBACK DlgPopupOpts(HWND hdlg, UINT msg, WPARAM wParam, LPARAM lParam) case IDC_VAR3: // display variable list _tcsncpy(str, _T(" \n"),SIZEOF(str) - 1); // to make the message box wider - _tcsncat(str, VAR_LIST_POPUP, SIZEOF(str) - mir_tstrlen(str)); - _tcsncat(str, _T("\n"), SIZEOF(str) - mir_tstrlen(str)); - _tcsncat(str, CUSTOM_VARS, SIZEOF(str) - mir_tstrlen(str)); + mir_tstrncat(str, VAR_LIST_POPUP, SIZEOF(str) - mir_tstrlen(str)); + mir_tstrncat(str, _T("\n"), SIZEOF(str) - mir_tstrlen(str)); + mir_tstrncat(str, CUSTOM_VARS, SIZEOF(str) - mir_tstrlen(str)); MessageBox(NULL, str, TranslateT("Variable List"), MB_OK|MB_ICONASTERISK|MB_TOPMOST); break; diff --git a/plugins/Weather/src/weather_update.cpp b/plugins/Weather/src/weather_update.cpp index 8baf32ee74..ed9275e2c4 100644 --- a/plugins/Weather/src/weather_update.cpp +++ b/plugins/Weather/src/weather_update.cpp @@ -60,9 +60,9 @@ int UpdateWeather(MCONTACT hContact) // show warnings by popup mir_sntprintf(str, SIZEOF(str) - 105, TranslateT("Unable to retrieve weather information for %s"), dbv.ptszVal); - _tcsncat(str, _T("\n"), SIZEOF(str) - mir_tstrlen(str)); + mir_tstrncat(str, _T("\n"), SIZEOF(str) - mir_tstrlen(str)); TCHAR *tszError = GetError(code); - _tcsncat(str, tszError, SIZEOF(str) - mir_tstrlen(str)); + mir_tstrncat(str, tszError, SIZEOF(str) - mir_tstrlen(str)); WPShowMessage(str, SM_WARNING); mir_free(tszError); } @@ -489,14 +489,14 @@ int GetWeatherData(MCONTACT hContact) case '[': // variable, add the value to the result string hasvar = TRUE; if ( !DBGetData(hContact, _T2A(str2), &dbv)) { - _tcsncat(DataValue, dbv.ptszVal, SIZEOF(DataValue) - mir_tstrlen(DataValue)); + mir_tstrncat(DataValue, dbv.ptszVal, SIZEOF(DataValue) - mir_tstrlen(DataValue)); DataValue[SIZEOF(DataValue)-1] = 0; db_free(&dbv); } break; case'\"': // constant, add it to the result string - _tcsncat(DataValue, TranslateTS(str2), SIZEOF(DataValue) - mir_tstrlen(DataValue)); + mir_tstrncat(DataValue, TranslateTS(str2), SIZEOF(DataValue) - mir_tstrlen(DataValue)); DataValue[SIZEOF(DataValue)-1] = 0; break; } diff --git a/protocols/Gadu-Gadu/src/core.cpp b/protocols/Gadu-Gadu/src/core.cpp index b9020142e1..2bf2907cf4 100644 --- a/protocols/Gadu-Gadu/src/core.cpp +++ b/protocols/Gadu-Gadu/src/core.cpp @@ -638,7 +638,7 @@ retry: _tcsncpy_s(strFmt2, pcli->pfnGetStatusModeDescription( status_gg2m(atoi(__status)), 0), _TRUNCATE); if (__city) { mir_sntprintf(strFmt1, SIZEOF(strFmt1), _T(", %s %s"), TranslateT("City:"), __city); - _tcsncat(strFmt2, strFmt1, SIZEOF(strFmt2) - mir_tstrlen(strFmt2)); + mir_tstrncat(strFmt2, strFmt1, SIZEOF(strFmt2) - mir_tstrlen(strFmt2)); } if (__birthyear) { time_t t = time(NULL); @@ -647,7 +647,7 @@ retry: if (br < (lt->tm_year + 1900) && br > 1900) { mir_sntprintf(strFmt1, SIZEOF(strFmt1), _T(", %s %d"), TranslateT("Age:"), (lt->tm_year + 1900) - br); - _tcsncat(strFmt2, strFmt1, SIZEOF(strFmt2) - mir_tstrlen(strFmt2)); + mir_tstrncat(strFmt2, strFmt1, SIZEOF(strFmt2) - mir_tstrlen(strFmt2)); } } diff --git a/protocols/Gadu-Gadu/src/import.cpp b/protocols/Gadu-Gadu/src/import.cpp index 95e9446ca6..2ca709ae01 100644 --- a/protocols/Gadu-Gadu/src/import.cpp +++ b/protocols/Gadu-Gadu/src/import.cpp @@ -337,7 +337,7 @@ INT_PTR GGPROTO::import_text(WPARAM wParam, LPARAM lParam) OPENFILENAME ofn = {0}; ofn.lStructSize = OPENFILENAME_SIZE_VERSION_400; _tcsncpy(filter, TranslateT("Text files"), SIZEOF(filter)); - _tcsncat(filter, _T(" (*.txt)"), SIZEOF(filter) - mir_tstrlen(filter)); + mir_tstrncat(filter, _T(" (*.txt)"), SIZEOF(filter) - mir_tstrlen(filter)); pfilter = filter + mir_tstrlen(filter) + 1; if (pfilter >= filter + SIZEOF(filter)) return 0; @@ -347,7 +347,7 @@ INT_PTR GGPROTO::import_text(WPARAM wParam, LPARAM lParam) if (pfilter >= filter + SIZEOF(filter)) return 0; _tcsncpy(pfilter, TranslateT("All Files"), SIZEOF(filter) - (pfilter - filter)); - _tcsncat(pfilter, _T(" (*)"), SIZEOF(filter) - (pfilter - filter) - mir_tstrlen(pfilter)); + mir_tstrncat(pfilter, _T(" (*)"), SIZEOF(filter) - (pfilter - filter) - mir_tstrlen(pfilter)); pfilter = pfilter + mir_tstrlen(pfilter) + 1; if (pfilter >= filter + SIZEOF(filter)) @@ -404,11 +404,11 @@ INT_PTR GGPROTO::export_text(WPARAM wParam, LPARAM lParam) TCHAR filter[512], *pfilter; _tcsncpy(str, TranslateT("contacts"), SIZEOF(str)); - _tcsncat(str, _T(".txt"), SIZEOF(str) - mir_tstrlen(str)); + mir_tstrncat(str, _T(".txt"), SIZEOF(str) - mir_tstrlen(str)); ofn.lStructSize = OPENFILENAME_SIZE_VERSION_400; _tcsncpy(filter, TranslateT("Text files"), SIZEOF(filter)); - _tcsncat(filter, _T(" (*.txt)"), SIZEOF(filter) - mir_tstrlen(filter)); + mir_tstrncat(filter, _T(" (*.txt)"), SIZEOF(filter) - mir_tstrlen(filter)); pfilter = filter + mir_tstrlen(filter) + 1; if (pfilter >= filter + SIZEOF(filter)) return 0; @@ -417,7 +417,7 @@ INT_PTR GGPROTO::export_text(WPARAM wParam, LPARAM lParam) if (pfilter >= filter + SIZEOF(filter)) return 0; _tcsncpy(pfilter, TranslateT("All Files"), SIZEOF(filter) - (pfilter - filter)); - _tcsncat(pfilter, _T(" (*)"), SIZEOF(filter) - (pfilter - filter) - mir_tstrlen(pfilter)); + mir_tstrncat(pfilter, _T(" (*)"), SIZEOF(filter) - (pfilter - filter) - mir_tstrlen(pfilter)); pfilter = pfilter + mir_tstrlen(pfilter) + 1; if (pfilter >= filter + SIZEOF(filter)) return 0; diff --git a/protocols/JabberG/src/jabber_adhoc.cpp b/protocols/JabberG/src/jabber_adhoc.cpp index fedcb897c3..378c610910 100644 --- a/protocols/JabberG/src/jabber_adhoc.cpp +++ b/protocols/JabberG/src/jabber_adhoc.cpp @@ -541,8 +541,8 @@ int __cdecl CJabberProto::ContactMenuRunCommands(WPARAM hContact, LPARAM lParam) if (selected > 0) { JABBER_RESOURCE_STATUS *r = item->arResources[selected - 1]; if (r) { - _tcsncat(jid, _T("/"), SIZEOF(jid) - mir_tstrlen(jid)); - _tcsncat(jid, r->m_tszResourceName, SIZEOF(jid) - mir_tstrlen(jid)); + mir_tstrncat(jid, _T("/"), SIZEOF(jid) - mir_tstrlen(jid)); + mir_tstrncat(jid, r->m_tszResourceName, SIZEOF(jid) - mir_tstrlen(jid)); } selected = 1; } diff --git a/src/modules/utils/bmpfilter.cpp b/src/modules/utils/bmpfilter.cpp index f2594ffc4c..dddc7b8ca0 100644 --- a/src/modules/utils/bmpfilter.cpp +++ b/src/modules/utils/bmpfilter.cpp @@ -189,37 +189,37 @@ static INT_PTR BmpFilterGetStringsW(WPARAM wParam, LPARAM lParam) TCHAR *filter = (TCHAR*)lParam, *pfilter; mir_tstrncpy(filter, TranslateT("All bitmaps"), bytesLeft); bytesLeft -= mir_tstrlen(filter); - _tcsncat(filter, _T(" (*.bmp;*.jpg;*.gif;*.png)"), bytesLeft); + mir_tstrncat(filter, _T(" (*.bmp;*.jpg;*.gif;*.png)"), bytesLeft); pfilter = filter + mir_tstrlen(filter) + 1; bytesLeft = wParam - (pfilter - filter); mir_tstrncpy(pfilter, _T("*.BMP;*.RLE;*.JPG;*.JPEG;*.GIF;*.PNG"), bytesLeft); pfilter += mir_tstrlen(pfilter) + 1; bytesLeft = wParam - (pfilter - filter); mir_tstrncpy(pfilter, TranslateT("Windows bitmaps"), bytesLeft); bytesLeft -= mir_tstrlen(pfilter); - _tcsncat(pfilter, _T(" (*.bmp;*.rle)"), bytesLeft); + mir_tstrncat(pfilter, _T(" (*.bmp;*.rle)"), bytesLeft); pfilter += mir_tstrlen(pfilter) + 1; bytesLeft = wParam - (pfilter - filter); mir_tstrncpy(pfilter, _T("*.BMP;*.RLE"), bytesLeft); pfilter += mir_tstrlen(pfilter) + 1; bytesLeft = wParam - (pfilter - filter); mir_tstrncpy(pfilter, TranslateT("JPEG bitmaps"), bytesLeft); bytesLeft -= mir_tstrlen(pfilter); - _tcsncat(pfilter, _T(" (*.jpg;*.jpeg)"), bytesLeft); + mir_tstrncat(pfilter, _T(" (*.jpg;*.jpeg)"), bytesLeft); pfilter += mir_tstrlen(pfilter) + 1; bytesLeft = wParam - (pfilter - filter); mir_tstrncpy(pfilter, _T("*.JPG;*.JPEG"), bytesLeft); pfilter += mir_tstrlen(pfilter) + 1; bytesLeft = wParam - (pfilter - filter); mir_tstrncpy(pfilter, TranslateT("GIF bitmaps"), bytesLeft); bytesLeft -= mir_tstrlen(pfilter); - _tcsncat(pfilter, _T(" (*.gif)"), bytesLeft); + mir_tstrncat(pfilter, _T(" (*.gif)"), bytesLeft); pfilter += mir_tstrlen(pfilter) + 1; bytesLeft = wParam - (pfilter - filter); mir_tstrncpy(pfilter, _T("*.GIF"), bytesLeft); pfilter += mir_tstrlen(pfilter) + 1; bytesLeft = wParam - (pfilter - filter); mir_tstrncpy(pfilter, TranslateT("PNG bitmaps"), bytesLeft); bytesLeft -= mir_tstrlen(pfilter); - _tcsncat(pfilter, _T(" (*.png)"), bytesLeft); + mir_tstrncat(pfilter, _T(" (*.png)"), bytesLeft); pfilter += mir_tstrlen(pfilter) + 1; bytesLeft = wParam - (pfilter - filter); mir_tstrncpy(pfilter, _T("*.PNG"), bytesLeft); pfilter += mir_tstrlen(pfilter) + 1; bytesLeft = wParam - (pfilter - filter); mir_tstrncpy(pfilter, TranslateT("All files"), bytesLeft); bytesLeft -= mir_tstrlen(pfilter); - _tcsncat(pfilter, _T(" (*)"), bytesLeft); + mir_tstrncat(pfilter, _T(" (*)"), bytesLeft); pfilter += mir_tstrlen(pfilter) + 1; bytesLeft = wParam - (pfilter - filter); mir_tstrncpy(pfilter, _T("*"), bytesLeft); pfilter += mir_tstrlen(pfilter) + 1; bytesLeft = wParam - (pfilter - filter); -- cgit v1.2.3