From 688f55ba998c19304a29727c910504903f4cc49a Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sun, 30 Nov 2014 18:51:36 +0000 Subject: lstr* replacements git-svn-id: http://svn.miranda-ng.org/main/trunk@11176 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/DbEditorPP/src/exportimport.cpp | 10 +++++----- plugins/DbEditorPP/src/watchedvars.cpp | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'plugins/DbEditorPP/src') diff --git a/plugins/DbEditorPP/src/exportimport.cpp b/plugins/DbEditorPP/src/exportimport.cpp index 4e2aa2b3e0..3141423c99 100644 --- a/plugins/DbEditorPP/src/exportimport.cpp +++ b/plugins/DbEditorPP/src/exportimport.cpp @@ -43,7 +43,7 @@ int Openfile(char *outputFile, const char *module) if (!GetSaveFileName(&ofn)) return 0; - lstrcpy(outputFile,filename); + mir_tstrcpy(outputFile,filename); return 1; } @@ -493,7 +493,7 @@ void importSettings(MCONTACT hContact, char *importstring ) case 'r': *pstr='\r'; break; default: *pstr=pstr[1]; break; } - MoveMemory(pstr+1,pstr+2,lstrlenA(pstr+2)+1); + MoveMemory(pstr+1,pstr+2,mir_strlen(pstr+2)+1); } } } @@ -654,14 +654,14 @@ void ImportSettingsFromFileMenuItem(MCONTACT hContact, char* FilePath) else { if(Exists(FilePath)) - lstrcpy(szFileNames, FilePath); + mir_tstrcpy(szFileNames, FilePath); else - lstrcpy(szFileNames, ""); + mir_tstrcpy(szFileNames, ""); } if (!lstrcmp(szFileNames, "") == 0) { - if ((DWORD)lstrlenA(szFileNames) < offset) + if ((DWORD)mir_strlen(szFileNames) < offset) { index += offset; strncpy(szPath, szFileNames, offset); diff --git a/plugins/DbEditorPP/src/watchedvars.cpp b/plugins/DbEditorPP/src/watchedvars.cpp index df5468c285..96d15d638b 100644 --- a/plugins/DbEditorPP/src/watchedvars.cpp +++ b/plugins/DbEditorPP/src/watchedvars.cpp @@ -331,8 +331,8 @@ void popupWatchedVar(MCONTACT hContact,const char* module,const char* setting) POPUPDATA ppd = { 0 }; ppd.lchContact = (MCONTACT)hContact; ppd.lchIcon = hIcon; - lstrcpyn(ppd.lpzContactName, lpzContactName,MAX_CONTACTNAME); - lstrcpyn(ppd.lpzText, lpzText,MAX_SECONDLINE); + mir_tstrncpy(ppd.lpzContactName, lpzContactName,MAX_CONTACTNAME); + mir_tstrncpy(ppd.lpzText, lpzText,MAX_SECONDLINE); ppd.colorBack = colorBack; ppd.colorText = colorText; ppd.iSeconds = timeout ? timeout : -1; -- cgit v1.2.3