diff options
| author | Kirill Volinsky <mataes2007@gmail.com> | 2015-05-23 18:08:26 +0000 | 
|---|---|---|
| committer | Kirill Volinsky <mataes2007@gmail.com> | 2015-05-23 18:08:26 +0000 | 
| commit | 9cadeadaff74b37df1c2896e653a80b3ce4c86f6 (patch) | |
| tree | 399715b05def27cc4e13ced2cbefad3a17b77c4e /plugins/Scriver/src | |
| parent | 6fcfba2c46a456677b5825a899469ba4e8905448 (diff) | |
replace _tcsncpy to mir_tstrncpy
git-svn-id: http://svn.miranda-ng.org/main/trunk@13786 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/Scriver/src')
| -rw-r--r-- | plugins/Scriver/src/infobar.cpp | 4 | ||||
| -rw-r--r-- | plugins/Scriver/src/msgdialog.cpp | 2 | ||||
| -rw-r--r-- | plugins/Scriver/src/msgoptions.cpp | 10 | ||||
| -rw-r--r-- | plugins/Scriver/src/utils.cpp | 4 | 
4 files changed, 10 insertions, 10 deletions
diff --git a/plugins/Scriver/src/infobar.cpp b/plugins/Scriver/src/infobar.cpp index 301ab1f909..9ff8429067 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;
 -	_tcsncpy(cf2.szFaceName, lf.lfFaceName, LF_FACESIZE);
 +	mir_tstrncpy(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;
 -	_tcsncpy(cf2.szFaceName, lf.lfFaceName, LF_FACESIZE);
 +	mir_tstrncpy(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 52840bd307..27451b78b3 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;
 -		_tcsncpy(cf2.szFaceName, lf.lfFaceName, LF_FACESIZE);
 +		mir_tstrncpy(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 c854ba09d8..25f4cb7bc1 100644 --- a/plugins/Scriver/src/msgoptions.cpp +++ b/plugins/Scriver/src/msgoptions.cpp @@ -116,13 +116,13 @@ void RegisterFontServiceFonts()  		char szTemp[100];
  		mir_snprintf(szTemp, SIZEOF(szTemp), "SRMFont%d", i);
  		mir_strncpy(fid.prefix, szTemp, SIZEOF(fid.prefix));
 -		_tcsncpy(fid.name, fontOptionsList[i].szDescr, SIZEOF(fid.name));
 +		mir_tstrncpy(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;
 -		_tcsncpy(fid.deffontsettings.szFace, fontOptionsList[i].szDefFace, SIZEOF(fid.deffontsettings.szFace));
 -		_tcsncpy(fid.backgroundName, fontOptionsList[i].szBkgName, SIZEOF(fid.backgroundName));
 +		mir_tstrncpy(fid.deffontsettings.szFace, fontOptionsList[i].szDefFace, SIZEOF(fid.deffontsettings.szFace));
 +		mir_tstrncpy(fid.backgroundName, fontOptionsList[i].szBkgName, SIZEOF(fid.backgroundName));
  		FontRegisterT(&fid);
  	}
 @@ -132,7 +132,7 @@ void RegisterFontServiceFonts()  	cid.flags = 0;
  	for (int i = 0; i < SIZEOF(colourOptionsList); i++) {
  		cid.order = i;
 -		_tcsncpy(cid.name, colourOptionsList[i].szName, SIZEOF(cid.name));
 +		mir_tstrncpy(cid.name, colourOptionsList[i].szName, SIZEOF(cid.name));
  		if (colourOptionsList[i].systemColor != -1)
  			cid.defcolour = GetSysColor(colourOptionsList[i].systemColor);
  		else
 @@ -192,7 +192,7 @@ void LoadMsgDlgFont(int i, LOGFONT *lf, COLORREF *colour)  		if (tszFace == NULL)
  			mir_tstrcpy(lf->lfFaceName, fontOptionsList[i].szDefFace);
  		else
 -			_tcsncpy(lf->lfFaceName, tszFace, SIZEOF(lf->lfFaceName));
 +			mir_tstrncpy(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 1d4e9b829f..24148f7077 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));
 -		_tcsncpy(ptszTemp, text, limit + 1);
 -		_tcsncpy(ptszTemp + limit, _T("..."), 4);
 +		mir_tstrncpy(ptszTemp, text, limit + 1);
 +		mir_tstrncpy(ptszTemp + limit, _T("..."), 4);
  		return ptszTemp;
  	}
  	return text;
  | 
