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/Scriver/src/infobar.cpp | 4 ++-- plugins/Scriver/src/msgdialog.cpp | 2 +- plugins/Scriver/src/msgoptions.cpp | 18 +++++++++--------- plugins/Scriver/src/utils.cpp | 4 ++-- 4 files changed, 14 insertions(+), 14 deletions(-) (limited to 'plugins/Scriver') diff --git a/plugins/Scriver/src/infobar.cpp b/plugins/Scriver/src/infobar.cpp index 9ff8429067..301ab1f909 100644 --- a/plugins/Scriver/src/infobar.cpp +++ b/plugins/Scriver/src/infobar.cpp @@ -37,7 +37,7 @@ void SetupInfobar(InfobarWindowData* idat) cf2.cbSize = sizeof(cf2); cf2.crTextColor = colour; cf2.bCharSet = lf.lfCharSet; - mir_tstrncpy(cf2.szFaceName, lf.lfFaceName, LF_FACESIZE); + _tcsncpy(cf2.szFaceName, lf.lfFaceName, LF_FACESIZE); cf2.dwEffects = ((lf.lfWeight >= FW_BOLD) ? CFE_BOLD : 0) | (lf.lfItalic ? CFE_ITALIC : 0); cf2.wWeight = (WORD)lf.lfWeight; cf2.bPitchAndFamily = lf.lfPitchAndFamily; @@ -51,7 +51,7 @@ void SetupInfobar(InfobarWindowData* idat) cf2.cbSize = sizeof(cf2); cf2.crTextColor = colour; cf2.bCharSet = lf.lfCharSet; - mir_tstrncpy(cf2.szFaceName, lf.lfFaceName, LF_FACESIZE); + _tcsncpy(cf2.szFaceName, lf.lfFaceName, LF_FACESIZE); cf2.dwEffects = ((lf.lfWeight >= FW_BOLD) ? CFE_BOLD : 0) | (lf.lfItalic ? CFE_ITALIC : 0); cf2.wWeight = (WORD)lf.lfWeight; cf2.bPitchAndFamily = lf.lfPitchAndFamily; diff --git a/plugins/Scriver/src/msgdialog.cpp b/plugins/Scriver/src/msgdialog.cpp index 27451b78b3..52840bd307 100644 --- a/plugins/Scriver/src/msgdialog.cpp +++ b/plugins/Scriver/src/msgdialog.cpp @@ -1107,7 +1107,7 @@ INT_PTR CALLBACK DlgProcMessage(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP cf2.dwMask = CFM_COLOR | CFM_FACE | CFM_CHARSET | CFM_SIZE | CFM_WEIGHT | CFM_BOLD | CFM_ITALIC; cf2.crTextColor = colour; cf2.bCharSet = lf.lfCharSet; - mir_tstrncpy(cf2.szFaceName, lf.lfFaceName, LF_FACESIZE); + _tcsncpy(cf2.szFaceName, lf.lfFaceName, LF_FACESIZE); cf2.dwEffects = ((lf.lfWeight >= FW_BOLD) ? CFE_BOLD : 0) | (lf.lfItalic ? CFE_ITALIC : 0); cf2.wWeight = (WORD)lf.lfWeight; cf2.bPitchAndFamily = lf.lfPitchAndFamily; diff --git a/plugins/Scriver/src/msgoptions.cpp b/plugins/Scriver/src/msgoptions.cpp index 25f4cb7bc1..9bf514bd3d 100644 --- a/plugins/Scriver/src/msgoptions.cpp +++ b/plugins/Scriver/src/msgoptions.cpp @@ -108,37 +108,37 @@ void RegisterFontServiceFonts() FontIDT fid = { sizeof(fid) }; _tcsncpy_s(fid.group, LPGENT("Messaging"), _TRUNCATE); _tcsncpy_s(fid.backgroundGroup, LPGENT("Messaging"), _TRUNCATE); - mir_strncpy(fid.dbSettingsGroup, SRMMMOD, SIZEOF(fid.dbSettingsGroup)); + strncpy(fid.dbSettingsGroup, SRMMMOD, SIZEOF(fid.dbSettingsGroup)); fid.flags = FIDF_DEFAULTVALID | FIDF_DEFAULTVALID; for (int i = 0; i < SIZEOF(fontOptionsList); i++) { fid.order = i; char szTemp[100]; mir_snprintf(szTemp, SIZEOF(szTemp), "SRMFont%d", i); - mir_strncpy(fid.prefix, szTemp, SIZEOF(fid.prefix)); - mir_tstrncpy(fid.name, fontOptionsList[i].szDescr, SIZEOF(fid.name)); + strncpy(fid.prefix, szTemp, SIZEOF(fid.prefix)); + _tcsncpy(fid.name, fontOptionsList[i].szDescr, SIZEOF(fid.name)); fid.deffontsettings.colour = fontOptionsList[i].defColour; fid.deffontsettings.size = fontOptionsList[i].defSize; fid.deffontsettings.style = fontOptionsList[i].defStyle; fid.deffontsettings.charset = DEFAULT_CHARSET; - mir_tstrncpy(fid.deffontsettings.szFace, fontOptionsList[i].szDefFace, SIZEOF(fid.deffontsettings.szFace)); - mir_tstrncpy(fid.backgroundName, fontOptionsList[i].szBkgName, SIZEOF(fid.backgroundName)); + _tcsncpy(fid.deffontsettings.szFace, fontOptionsList[i].szDefFace, SIZEOF(fid.deffontsettings.szFace)); + _tcsncpy(fid.backgroundName, fontOptionsList[i].szBkgName, SIZEOF(fid.backgroundName)); FontRegisterT(&fid); } ColourIDT cid = { sizeof(cid) }; _tcsncpy_s(cid.group, LPGENT("Messaging"), _TRUNCATE); - mir_strncpy(cid.dbSettingsGroup, SRMMMOD, SIZEOF(fid.dbSettingsGroup)); + strncpy(cid.dbSettingsGroup, SRMMMOD, SIZEOF(fid.dbSettingsGroup)); cid.flags = 0; for (int i = 0; i < SIZEOF(colourOptionsList); i++) { cid.order = i; - mir_tstrncpy(cid.name, colourOptionsList[i].szName, SIZEOF(cid.name)); + _tcsncpy(cid.name, colourOptionsList[i].szName, SIZEOF(cid.name)); if (colourOptionsList[i].systemColor != -1) cid.defcolour = GetSysColor(colourOptionsList[i].systemColor); else cid.defcolour = colourOptionsList[i].defColour; - mir_strncpy(cid.setting, colourOptionsList[i].szSettingName, SIZEOF(cid.setting)); + strncpy(cid.setting, colourOptionsList[i].szSettingName, SIZEOF(cid.setting)); ColourRegisterT(&cid); } } @@ -192,7 +192,7 @@ void LoadMsgDlgFont(int i, LOGFONT *lf, COLORREF *colour) if (tszFace == NULL) mir_tstrcpy(lf->lfFaceName, fontOptionsList[i].szDefFace); else - mir_tstrncpy(lf->lfFaceName, tszFace, SIZEOF(lf->lfFaceName)); + _tcsncpy(lf->lfFaceName, tszFace, SIZEOF(lf->lfFaceName)); mir_snprintf(str, SIZEOF(str), "%s%dSet", "SRMFont", i); lf->lfCharSet = db_get_b(NULL, SRMMMOD, str, DEFAULT_CHARSET); diff --git a/plugins/Scriver/src/utils.cpp b/plugins/Scriver/src/utils.cpp index 24148f7077..1d4e9b829f 100644 --- a/plugins/Scriver/src/utils.cpp +++ b/plugins/Scriver/src/utils.cpp @@ -199,8 +199,8 @@ TCHAR* limitText(TCHAR *text, int limit) size_t len = mir_tstrlen(text); if (len > g_dat.limitNamesLength) { TCHAR *ptszTemp = (TCHAR*)mir_alloc(sizeof(TCHAR) * (limit + 4)); - mir_tstrncpy(ptszTemp, text, limit + 1); - mir_tstrncpy(ptszTemp + limit, _T("..."), 4); + _tcsncpy(ptszTemp, text, limit + 1); + _tcsncpy(ptszTemp + limit, _T("..."), 4); return ptszTemp; } return text; -- cgit v1.2.3