From babf7873a3fe373d60ef22b1b671d98e014d8819 Mon Sep 17 00:00:00 2001 From: Kirill Volinsky Date: Fri, 22 May 2015 19:52:29 +0000 Subject: replace strcpy to mir_strcpy git-svn-id: http://svn.miranda-ng.org/main/trunk@13763 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/Xfire/src/SHA1.cpp | 2 +- protocols/Xfire/src/SHA1.h | 2 +- protocols/Xfire/src/Xfire_base.cpp | 4 +-- protocols/Xfire/src/Xfire_game.cpp | 2 +- protocols/Xfire/src/addgamedialog.cpp | 2 +- protocols/Xfire/src/main.cpp | 50 ++++++++++++++++---------------- protocols/Xfire/src/options.cpp | 8 ++--- protocols/Xfire/src/passworddialog.cpp | 4 +-- protocols/Xfire/src/processbuddyinfo.cpp | 2 +- protocols/Xfire/src/searching4games.cpp | 20 ++++++------- protocols/Xfire/src/tools.cpp | 6 ++-- protocols/Xfire/src/userdetails.cpp | 2 +- 12 files changed, 52 insertions(+), 52 deletions(-) (limited to 'protocols/Xfire') diff --git a/protocols/Xfire/src/SHA1.cpp b/protocols/Xfire/src/SHA1.cpp index fd8c6eb2e6..0c1dc41a5b 100644 --- a/protocols/Xfire/src/SHA1.cpp +++ b/protocols/Xfire/src/SHA1.cpp @@ -249,7 +249,7 @@ void CSHA1::ReportHash(char *szReport, unsigned char uReportType) strcat(szReport, szTemp); } } - else strcpy(szReport, "Error: Unknown report type!"); + else mir_strcpy(szReport, "Error: Unknown report type!"); } // Get the raw message digest diff --git a/protocols/Xfire/src/SHA1.h b/protocols/Xfire/src/SHA1.h index 2bb15df86a..a64c8b589b 100644 --- a/protocols/Xfire/src/SHA1.h +++ b/protocols/Xfire/src/SHA1.h @@ -27,7 +27,7 @@ #include // Needed for file access #include // Needed for memset and memcpy -#include // Needed for strcat and strcpy +#include // Needed for strcat and mir_strcpy #include #include diff --git a/protocols/Xfire/src/Xfire_base.cpp b/protocols/Xfire/src/Xfire_base.cpp index dca9b7a3c3..17a24c2e0c 100644 --- a/protocols/Xfire/src/Xfire_base.cpp +++ b/protocols/Xfire/src/Xfire_base.cpp @@ -499,7 +499,7 @@ BOOL Xfire_base::getIniPath(char*path) { //kein ziel abbruch if (!path) return FALSE; - strcpy(path, XFireGetFoldersPath("IniFile")); + mir_strcpy(path, XFireGetFoldersPath("IniFile")); strcat_s(path, MAX_PATH, "xfire_games.ini"); return TRUE; } @@ -508,7 +508,7 @@ BOOL Xfire_base::getIconPath(char*path) { //kein ziel abbruch if (!path) return FALSE; - strcpy(path, XFireGetFoldersPath("IconsFile")); + mir_strcpy(path, XFireGetFoldersPath("IconsFile")); return TRUE; } diff --git a/protocols/Xfire/src/Xfire_game.cpp b/protocols/Xfire/src/Xfire_game.cpp index f570dee912..31d43319e5 100644 --- a/protocols/Xfire/src/Xfire_game.cpp +++ b/protocols/Xfire/src/Xfire_game.cpp @@ -429,7 +429,7 @@ void Xfire_game::writeToDB(unsigned dbid) void Xfire_game::createMenuitem(unsigned int pos, int dbid) { char servicefunction[100]; - strcpy(servicefunction, protocolname); + mir_strcpy(servicefunction, protocolname); strcat(servicefunction, "StartGame%d"); if (dbid < 0) diff --git a/protocols/Xfire/src/addgamedialog.cpp b/protocols/Xfire/src/addgamedialog.cpp index 3c8f50ada9..e729a80ab3 100644 --- a/protocols/Xfire/src/addgamedialog.cpp +++ b/protocols/Xfire/src/addgamedialog.cpp @@ -44,7 +44,7 @@ static void FillGameList(LPVOID hwndDlg) { vector dublBuffer; //Cache ist leer, Cache füllen - strcpy(inipath, XFireGetFoldersPath("IniFile")); + mir_strcpy(inipath, XFireGetFoldersPath("IniFile")); strcat_s(inipath, MAX_PATH, "xfire_games.ini"); //ini soll in den RAM geladen werden, fürs schnellere ausparsen diff --git a/protocols/Xfire/src/main.cpp b/protocols/Xfire/src/main.cpp index a94599b1f3..5b23f979f2 100644 --- a/protocols/Xfire/src/main.cpp +++ b/protocols/Xfire/src/main.cpp @@ -1045,7 +1045,7 @@ extern "C" __declspec(dllexport) int Load(void) XDEBUGS("-----------------------------------------------------\n"); //statusmessages setzen - strcpy(statusmessage[0], ""); + mir_strcpy(statusmessage[0], ""); mir_snprintf(statusmessage[1], SIZEOF(statusmessage[1]), "(AFK) %s", Translate("Away from Keyboard")); HookEvent(ME_OPT_INITIALISE, OptInit); @@ -1123,7 +1123,7 @@ extern "C" __declspec(dllexport) int Load(void) char servicefunction[100]; //gotoprofilemenüpunkt - strcpy(servicefunction, protocolname); + mir_strcpy(servicefunction, protocolname); strcat(servicefunction, "GotoProfile"); CreateServiceFunction(servicefunction, GotoProfile); mi.pszService = servicefunction; @@ -1134,7 +1134,7 @@ extern "C" __declspec(dllexport) int Load(void) Menu_AddContactMenuItem(&mi); //gotoxfireclansitemenüpunkt - strcpy(servicefunction, protocolname); + mir_strcpy(servicefunction, protocolname); strcat(servicefunction, "GotoXFireClanSite"); CreateServiceFunction(servicefunction, GotoXFireClanSite); mi.pszService = servicefunction; @@ -1145,7 +1145,7 @@ extern "C" __declspec(dllexport) int Load(void) gotoclansite = Menu_AddContactMenuItem(&mi); //kopiermenüpunkt - strcpy(servicefunction, protocolname); + mir_strcpy(servicefunction, protocolname); strcat(servicefunction, "GetIPPort"); CreateServiceFunction(servicefunction, GetIPPort); mi.pszService = servicefunction; @@ -1156,7 +1156,7 @@ extern "C" __declspec(dllexport) int Load(void) copyipport = Menu_AddContactMenuItem(&mi); //kopiermenüpunkt - strcpy(servicefunction, protocolname); + mir_strcpy(servicefunction, protocolname); strcat(servicefunction, "VoiceIPPort"); CreateServiceFunction(servicefunction, GetVIPPort); mi.pszService = servicefunction; @@ -1167,7 +1167,7 @@ extern "C" __declspec(dllexport) int Load(void) vipport = Menu_AddContactMenuItem(&mi); //joinmenüpunkt - strcpy(servicefunction, protocolname); + mir_strcpy(servicefunction, protocolname); strcat(servicefunction, "JoinGame"); CreateServiceFunction(servicefunction, JoinGame); mi.pszService = servicefunction; @@ -1178,7 +1178,7 @@ extern "C" __declspec(dllexport) int Load(void) joingame = Menu_AddContactMenuItem(&mi); //joinmenüpunkt - strcpy(servicefunction, protocolname); + mir_strcpy(servicefunction, protocolname); strcat(servicefunction, "StartThisGame"); CreateServiceFunction(servicefunction, StartThisGame); mi.pszService = servicefunction; @@ -1189,7 +1189,7 @@ extern "C" __declspec(dllexport) int Load(void) startthisgame = Menu_AddContactMenuItem(&mi); //remove friend - strcpy(servicefunction, protocolname); + mir_strcpy(servicefunction, protocolname); strcat(servicefunction, "RemoveFriend"); CreateServiceFunction(servicefunction, RemoveFriend); mi.pszService = servicefunction; @@ -1200,7 +1200,7 @@ extern "C" __declspec(dllexport) int Load(void) removefriend = Menu_AddContactMenuItem(&mi); //block user - strcpy(servicefunction, protocolname); + mir_strcpy(servicefunction, protocolname); strcat(servicefunction, "BlockFriend"); CreateServiceFunction(servicefunction, BlockFriend); mi.pszService = servicefunction; @@ -1211,7 +1211,7 @@ extern "C" __declspec(dllexport) int Load(void) blockfriend = Menu_AddContactMenuItem(&mi); //my fire profile - strcpy(servicefunction, protocolname); + mir_strcpy(servicefunction, protocolname); strcat(servicefunction, "GotoProfile2"); CreateServiceFunction(servicefunction, GotoProfile2); mi.pszService = servicefunction; @@ -1222,7 +1222,7 @@ extern "C" __declspec(dllexport) int Load(void) Menu_AddMainMenuItem(&mi); //my activity protocol - strcpy(servicefunction, protocolname); + mir_strcpy(servicefunction, protocolname); strcat(servicefunction, "GotoProfileAct"); CreateServiceFunction(servicefunction, GotoProfileAct); mi.pszService = servicefunction; @@ -1233,7 +1233,7 @@ extern "C" __declspec(dllexport) int Load(void) Menu_AddMainMenuItem(&mi); //rescan my games - strcpy(servicefunction, protocolname); + mir_strcpy(servicefunction, protocolname); strcat(servicefunction, "ReScanMyGames"); CreateServiceFunction(servicefunction, ReScanMyGames); mi.pszService = servicefunction; @@ -1243,7 +1243,7 @@ extern "C" __declspec(dllexport) int Load(void) mi.ptszName = LPGENT("&Rescan my games..."); Menu_AddMainMenuItem(&mi); - strcpy(servicefunction, protocolname); + mir_strcpy(servicefunction, protocolname); strcat(servicefunction, "SetNick"); CreateServiceFunction(servicefunction, SetNickDlg); mi.pszService = servicefunction; @@ -1625,7 +1625,7 @@ MCONTACT CList_AddContact(XFireContact xfc, bool InList, bool SetOnline, int cla XFire_SetAvatar* xsa = new XFire_SetAvatar; xsa->hContact = hContact; xsa->username = new char[mir_strlen(xfc.username) + 1]; - strcpy(xsa->username, xfc.username); + mir_strcpy(xsa->username, xfc.username); mir_forkthread(SetAvatar, (LPVOID)xsa); } else @@ -1875,7 +1875,7 @@ BOOL GetAvatar(char* username, XFireAvatar* av) if (pos) { char filename[512]; - strcpy(filename, XFireGetFoldersPath("Avatar")); + mir_strcpy(filename, XFireGetFoldersPath("Avatar")); strcat(filename, username); pos++; @@ -1927,7 +1927,7 @@ static INT_PTR GetIPPort(WPARAM hContact, LPARAM lParam) HGLOBAL clipbuffer = GlobalAlloc(GMEM_DDESHARE, mir_strlen(temp) + 1); char *buffer = (char*)GlobalLock(clipbuffer); - strcpy(buffer, LPCSTR(temp)); + mir_strcpy(buffer, LPCSTR(temp)); GlobalUnlock(clipbuffer); SetClipboardData(CF_TEXT, clipbuffer); @@ -1955,7 +1955,7 @@ static INT_PTR GetVIPPort(WPARAM hContact, LPARAM lParam) HGLOBAL clipbuffer = GlobalAlloc(GMEM_DDESHARE, mir_strlen(temp) + 1); char *buffer = (char*)GlobalLock(clipbuffer); - strcpy(buffer, LPCSTR(temp)); + mir_strcpy(buffer, LPCSTR(temp)); GlobalUnlock(clipbuffer); SetClipboardData(CF_TEXT, clipbuffer); @@ -1972,7 +1972,7 @@ static INT_PTR GotoProfile(WPARAM hContact, LPARAM lParam) return 0; char temp[64]; - strcpy(temp, "http://xfire.com/profile/"); + mir_strcpy(temp, "http://xfire.com/profile/"); strcat_s(temp, 64, dbv.pszVal); db_free(&dbv); @@ -1992,7 +1992,7 @@ static INT_PTR GotoXFireClanSite(WPARAM hContact, LPARAM lParam) if (db_get_s(NULL, protocolname, temp, &dbv)) return 0; - strcpy(temp, "http://xfire.com/clans/"); + mir_strcpy(temp, "http://xfire.com/clans/"); strcat_s(temp, 64, dbv.pszVal); db_free(&dbv); @@ -2008,7 +2008,7 @@ static INT_PTR GotoProfile2(WPARAM wParam, LPARAM lParam) return 0; char temp[64]; - strcpy(temp, "http://xfire.com/profile/"); + mir_strcpy(temp, "http://xfire.com/profile/"); strcat_s(temp, 64, dbv.pszVal); db_free(&dbv); @@ -2024,7 +2024,7 @@ static INT_PTR GotoProfileAct(WPARAM wParam, LPARAM lParam) if (db_get_s(NULL, protocolname, "login", &dbv)) return 0; - strcpy(temp, "http://www.xfire.com/?username="); + mir_strcpy(temp, "http://www.xfire.com/?username="); strcat_s(temp, 64, dbv.pszVal); db_free(&dbv); @@ -2613,7 +2613,7 @@ if (db_get(entry->hcontact,"ContactPhoto", "File",&dbv)) XFire_SetAvatar* xsa=new XFire_SetAvatar; xsa->hContact=entry->hcontact; xsa->username=new char[mir_strlen(entry->username.c_str())+1]; -strcpy(xsa->username,entry->username.c_str()); +mir_strcpy(xsa->username,entry->username.c_str()); mir_forkthread(SetAvatar,(LPVOID)xsa); } @@ -3126,7 +3126,7 @@ INT_PTR SetAwayMsg(WPARAM wParam, LPARAM lParam) { if (wParam == ID_STATUS_ONLINE) { - strcpy(statusmessage[0], ""); + mir_strcpy(statusmessage[0], ""); } else if (wParam != ID_STATUS_OFFLINE/*&&db_get_b(NULL,protocolname,"nocustomaway",0)==0*/) { @@ -3137,12 +3137,12 @@ INT_PTR SetAwayMsg(WPARAM wParam, LPARAM lParam) { if (wParam == ID_STATUS_ONLINE) { - strcpy(statusmessage[0], (char*)lParam); + mir_strcpy(statusmessage[0], (char*)lParam); } else if (wParam != ID_STATUS_OFFLINE) { if (db_get_b(NULL, protocolname, "nocustomaway", 0) == 0 && mir_strlen((char*)lParam) > 0) { mir_snprintf(statusmessage[1], SIZEOF(statusmessage[1]), "(AFK) %s", (char*)lParam); - //strcpy(statusmessage[1],( char* )lParam); + //mir_strcpy(statusmessage[1],( char* )lParam); } else mir_snprintf(statusmessage[1], SIZEOF(statusmessage[1]), "(AFK) %s", Translate("Away from Keyboard")); diff --git a/protocols/Xfire/src/options.cpp b/protocols/Xfire/src/options.cpp index c108822805..e57aee4848 100644 --- a/protocols/Xfire/src/options.cpp +++ b/protocols/Xfire/src/options.cpp @@ -578,7 +578,7 @@ static INT_PTR CALLBACK DlgProcOpts4(HWND hwndDlg, UINT msg, WPARAM wParam, LPAR //addgamedia auf 0 setzen TranslateDialogDefault(hwndDlg); - strcpy(inipath, XFireGetFoldersPath("IniFile")); + mir_strcpy(inipath, XFireGetFoldersPath("IniFile")); strcat(inipath, "xfire_games.ini"); FILE * f = fopen(inipath, "r"); @@ -594,7 +594,7 @@ static INT_PTR CALLBACK DlgProcOpts4(HWND hwndDlg, UINT msg, WPARAM wParam, LPAR inifound = FALSE; } - strcpy(inipath, XFireGetFoldersPath("IconsFile")); + mir_strcpy(inipath, XFireGetFoldersPath("IconsFile")); strcat(inipath, "icons.dll"); f = fopen(inipath, "r"); @@ -618,7 +618,7 @@ static INT_PTR CALLBACK DlgProcOpts4(HWND hwndDlg, UINT msg, WPARAM wParam, LPAR SendDlgItemMessage(hwndDlg, IDC_REMUSER, BM_SETIMAGE, IMAGE_ICON, (WPARAM)LoadSkinnedIcon(SKINICON_OTHER_DELETE)); - strcpy(inipath, XFireGetFoldersPath("IniFile")); + mir_strcpy(inipath, XFireGetFoldersPath("IniFile")); SetDlgItemTextA(hwndDlg, IDC_FILESSHOULDBE, inipath); EnableDlgItem(hwndDlg, IDC_REMUSER, FALSE); @@ -897,7 +897,7 @@ static INT_PTR CALLBACK DlgProcOpts6(HWND hwndDlg, UINT msg, WPARAM wParam, LPAR EmptyClipboard(); clipbuffer = GlobalAlloc(GMEM_DDESHARE, mir_strlen(out)+1); buffer = (char*)GlobalLock(clipbuffer); - strcpy(buffer, LPCSTR(out)); + mir_strcpy(buffer, LPCSTR(out)); GlobalUnlock(clipbuffer); SetClipboardData(CF_TEXT, clipbuffer); diff --git a/protocols/Xfire/src/passworddialog.cpp b/protocols/Xfire/src/passworddialog.cpp index f6cdb167c8..4be5760eef 100644 --- a/protocols/Xfire/src/passworddialog.cpp +++ b/protocols/Xfire/src/passworddialog.cpp @@ -51,9 +51,9 @@ void ShowPasswordDialog(char*pw, char*mynick) { usenick = FALSE; char* npw = (char*)DialogBox(hinstance, MAKEINTRESOURCE(IDD_PWDLG), NULL, DlgPWProc); - strcpy(pw, npw); + mir_strcpy(pw, npw); if (mynick) { - strcpy(mynick, (char*)nick); + mir_strcpy(mynick, (char*)nick); } } \ No newline at end of file diff --git a/protocols/Xfire/src/processbuddyinfo.cpp b/protocols/Xfire/src/processbuddyinfo.cpp index 4d92a63f51..c0fd32c751 100644 --- a/protocols/Xfire/src/processbuddyinfo.cpp +++ b/protocols/Xfire/src/processbuddyinfo.cpp @@ -50,7 +50,7 @@ void ProcessBuddyInfo(xfirelib::BuddyInfoPacket *buddyinfo, MCONTACT hcontact, c db_unset(NULL, protocolname, "MyAvatarFile"); } - strcpy(filename, XFireGetFoldersPath("Avatar")); + mir_strcpy(filename, XFireGetFoldersPath("Avatar")); switch (buddyinfo->avatarmode) { case 1: diff --git a/protocols/Xfire/src/searching4games.cpp b/protocols/Xfire/src/searching4games.cpp index e9d70c319e..80bf55faf0 100644 --- a/protocols/Xfire/src/searching4games.cpp +++ b/protocols/Xfire/src/searching4games.cpp @@ -76,7 +76,7 @@ BOOL CheckPath(char*ppath, char*pathwildcard = NULL) if (GetFileAttributesA(temp) != 0xFFFFFFFF) { //exe vorhanden???? unt hint? //gefundenes in path kopieren FindClose(fHandle); - strcpy(ppath, temp); + mir_strcpy(ppath, temp); return TRUE; } } @@ -242,7 +242,7 @@ void Scan4Games(LPVOID lparam) mir_forkthread(ShowSearchDialog, &hwnd); } - strcpy(inipath, XFireGetFoldersPath("IniFile")); + mir_strcpy(inipath, XFireGetFoldersPath("IniFile")); strcat(inipath, "xfire_games.ini"); //erstmal db säubern @@ -278,7 +278,7 @@ void Scan4Games(LPVOID lparam) //Registryschlüssel auslesen und pfad auf exe prüfen xfire_GetPrivateProfileString(temp, "LauncherDirKey", "", ret, 255, inipath); - strcpy(ret2, ret); + mir_strcpy(ret2, ret); //ersten part des registry schlüssel raustrennen pos = strchr(ret2, '\\'); @@ -342,7 +342,7 @@ void Scan4Games(LPVOID lparam) pos2 = path; pos2++; - strcpy(path, pos2); + mir_strcpy(path, pos2); } //mögliche weitere anführungszeichen entfernen @@ -362,7 +362,7 @@ void Scan4Games(LPVOID lparam) if (xfire_GetPrivateProfileString(temp, "InstallHint", "", ret2, 255, inipath)) { char pathtemp[XFIRE_MAX_STATIC_STRING_LEN]; - strcpy(pathtemp, path); + mir_strcpy(pathtemp, path); strcat(pathtemp, ret2); if (CheckPath(pathtemp)) @@ -370,7 +370,7 @@ void Scan4Games(LPVOID lparam) if (xfire_GetPrivateProfileString(temp, "DetectExe", "", ret, 255, inipath)) { cutforlaunch = path + mir_strlen(path); - strcpy(pathtemp, path); + mir_strcpy(pathtemp, path); //wenn backslash bei detectexe, dann diesen skippen (eveonline bug) if (ret[0] == '\\') @@ -384,7 +384,7 @@ void Scan4Games(LPVOID lparam) if (CheckPath(pathtemp)) { - strcpy(path, pathtemp); + mir_strcpy(path, pathtemp); } else { @@ -487,7 +487,7 @@ void Scan4Games(LPVOID lparam) path[i2] = tolower(path[i2]); char* mpathtemp = new char[mir_strlen(path) + 1]; - strcpy(mpathtemp, path); + mir_strcpy(mpathtemp, path); newgame->mpath.push_back(mpathtemp); } } @@ -506,7 +506,7 @@ void Scan4Games(LPVOID lparam) //pfad aufbereiten char launchpath[XFIRE_MAX_STATIC_STRING_LEN] = ""; - strcpy(launchpath, path); + mir_strcpy(launchpath, path); //letzten backslash entfernen if (launchpath[mir_strlen(launchpath) - 1] == '\\') launchpath[mir_strlen(launchpath) - 1] = 0; @@ -617,7 +617,7 @@ void Scan4Games(LPVOID lparam) //pfad aufbereiten char launchpath[XFIRE_MAX_STATIC_STRING_LEN] = ""; - strcpy(launchpath, ret2); + mir_strcpy(launchpath, ret2); if (strrchr(launchpath, '\\') != 0) { *(strrchr(launchpath, '\\')) = 0; diff --git a/protocols/Xfire/src/tools.cpp b/protocols/Xfire/src/tools.cpp index 38dcb396e8..3b1427d3af 100644 --- a/protocols/Xfire/src/tools.cpp +++ b/protocols/Xfire/src/tools.cpp @@ -37,7 +37,7 @@ extern HANDLE hNetlib; /*char* tohex(unsigned char*buf,int size) { static char buffer[1024*10]=""; - strcpy(buffer,""); + mir_strcpy(buffer,""); for(int i=0;i