diff options
Diffstat (limited to 'protocols/Xfire')
-rw-r--r-- | protocols/Xfire/src/Xfire_base.cpp | 8 | ||||
-rw-r--r-- | protocols/Xfire/src/Xfire_game.cpp | 4 | ||||
-rw-r--r-- | protocols/Xfire/src/main.cpp | 50 | ||||
-rw-r--r-- | protocols/Xfire/src/options.cpp | 16 | ||||
-rw-r--r-- | protocols/Xfire/src/searching4games.cpp | 16 |
5 files changed, 47 insertions, 47 deletions
diff --git a/protocols/Xfire/src/Xfire_base.cpp b/protocols/Xfire/src/Xfire_base.cpp index ff18001f25..a2923968da 100644 --- a/protocols/Xfire/src/Xfire_base.cpp +++ b/protocols/Xfire/src/Xfire_base.cpp @@ -100,7 +100,7 @@ void Xfire_base::readStringfromDB(char*name,unsigned int dbid,char**to) return;
//wert aus der dblesen
- sprintf_s(temp,128,"%s_%i",name,dbid);
+ mir_snprintf(temp, 128, "%s_%i", name, dbid);
if(!db_get_s(NULL, protocolname, temp,&dbv))
{
//string setzen
@@ -118,7 +118,7 @@ void Xfire_base::readStringfromDB(char*name,unsigned int dbid,int id,char**to) return;
//wert aus der dblesen
- sprintf_s(temp,128,"%s_%i_%i",name,dbid,id);
+ mir_snprintf(temp, 128, "%s_%i_%i", name, dbid, id);
if(!db_get_s(NULL, protocolname, temp,&dbv))
{
//string setzen
@@ -136,7 +136,7 @@ void Xfire_base::readUtf8StringfromDB(char*name,unsigned int dbid,char**to) return;
//wert aus der dblesen
- sprintf_s(temp,128,"%s_%i",name,dbid);
+ mir_snprintf(temp, 128, "%s_%i", name, dbid);
if(!db_get_utf(NULL, protocolname, temp,&dbv))
{
//string setzen
@@ -154,7 +154,7 @@ void Xfire_base::readUtf8StringfromDB(char*name,unsigned int dbid,int id,char**t return;
//wert aus der dblesen
- sprintf_s(temp,128,"%s_%i_%i",name,dbid,id);
+ mir_snprintf(temp, 128, "%s_%i_%i", name, dbid, id);
if(!db_get_utf(NULL, protocolname, temp,&dbv))
{
//string setzen
diff --git a/protocols/Xfire/src/Xfire_game.cpp b/protocols/Xfire/src/Xfire_game.cpp index 78a616ca04..7e378759ff 100644 --- a/protocols/Xfire/src/Xfire_game.cpp +++ b/protocols/Xfire/src/Xfire_game.cpp @@ -57,7 +57,7 @@ BOOL Xfire_game::start_game(char*ip,unsigned int port,char*pw) { //port begrenzen
port=port%65535;
//port in string wandeln
- sprintf_s(portstr,6,"%d",port);
+ mir_snprintf(portstr,6,"%d",port);
str_replace(mynetworkparams,"%UA_GAME_HOST_NAME%",ip);
str_replace(mynetworkparams,"%UA_GAME_HOST_PORT%",portstr);
@@ -443,7 +443,7 @@ void Xfire_game::createMenuitem(unsigned int pos,int dbid) mi.pszPopupName = Translate("Start game");
mi.pszContactOwner=protocolname;
- sprintf(temp,servicefunction,this->id);
+ mir_snprintf(temp, SIZEOF(temp), servicefunction, this->id);
//wenn die servicefunktion schon exisitert vernichten, hehe
if(ServiceExists(temp))
DestroyServiceFunction(temp);
diff --git a/protocols/Xfire/src/main.cpp b/protocols/Xfire/src/main.cpp index 8025b9a7e0..17891ac6ec 100644 --- a/protocols/Xfire/src/main.cpp +++ b/protocols/Xfire/src/main.cpp @@ -428,7 +428,7 @@ void XFireClient::sendmsg(char*usr,char*cmsg) { for(int i=0;i<claninv->numberOfInv;i++)
{
char msg[XFIRE_MAX_STATIC_STRING_LEN];
- sprintf(msg,Translate("%s (Nickname: %s) has invited you to join the %s clan. Message: %s%sPlease go to the XFireclan-Site to accept the Invitation."),claninv->invitefromusername[i].c_str(),
+ mir_snprintf(msg, SIZEOF(msg), Translate("%s (Nickname: %s) has invited you to join the %s clan. Message: %s%sPlease go to the XFireclan-Site to accept the Invitation."),claninv->invitefromusername[i].c_str(),
claninv->invitefrom[i].c_str(),
claninv->clanname[i].c_str(),
claninv->invitemsg[i].c_str(),"\n");
@@ -648,10 +648,10 @@ void XFireClient::sendmsg(char*usr,char*cmsg) { for(int i=0;i<clan->count;i++)
{
- sprintf(temp,"Clan_%d",clan->clanid[i]);
+ mir_snprintf(temp, SIZEOF(temp), "Clan_%d", clan->clanid[i]);
db_set_s(NULL, protocolname, temp, (char*)clan->name[i].c_str());
- sprintf(temp,"ClanUrl_%d",clan->clanid[i]);
+ mir_snprintf(temp, SIZEOF(temp), "ClanUrl_%d", clan->clanid[i]);
db_set_s(NULL, protocolname, temp, (char*)clan->url[i].c_str());
if(!db_get_b(NULL,protocolname,"noclangroups",0)) {
@@ -691,7 +691,7 @@ void XFireClient::sendmsg(char*usr,char*cmsg) { //recprotoverchg
if(db_get_w(NULL,protocolname,"recprotoverchg",0)==0)
{
- sprintf_s(temp,255,Translate("The protocol version is too old. Changed current version from %d to %d. You can reconnect now."),client->protocolVersion,version->newversion);
+ mir_snprintf(temp, SIZEOF(temp), Translate("The protocol version is too old. Changed current version from %d to %d. You can reconnect now."),client->protocolVersion,version->newversion);
MSGBOXE(temp);
}
else
@@ -702,7 +702,7 @@ void XFireClient::sendmsg(char*usr,char*cmsg) { }
else
{
- sprintf_s(temp,255,Translate("The protocol version is too old. Cannot detect a new version number."));
+ mir_snprintf(temp, SIZEOF(temp), Translate("The protocol version is too old. Cannot detect a new version number."));
MSGBOXE(temp);
SetStatus(ID_STATUS_OFFLINE,NULL);
}
@@ -867,7 +867,7 @@ INT_PTR UrlCall(WPARAM wparam,LPARAM lparam) { if(strlen(g)>25) //zugroße abschneiden
*(g+25)=0;
- sprintf_s(temp,100,Translate("Do you really want to add %s to your friend list?"),g);
+ mir_snprintf(temp, SIZEOF(temp), Translate("Do you really want to add %s to your friend list?"),g);
//Nutzer vorher fragen, ob er wirklich user xyz adden möchte
if(MessageBoxA(NULL,temp,"Miranda XFire Protocol Plugin",MB_YESNO|MB_ICONQUESTION)==IDYES)
{
@@ -2067,7 +2067,7 @@ static INT_PTR GetIPPort(WPARAM wParam,LPARAM lParam) if(db_get_s((HANDLE)wParam, protocolname, "ServerIP",&dbv))
return 0;
- sprintf(temp,"%s:%d",dbv.pszVal,db_get_w((HANDLE)wParam, protocolname, "Port", -1));
+ mir_snprintf(temp, SIZEOF(temp), "%s:%d", dbv.pszVal, db_get_w((HANDLE)wParam, protocolname, "Port", -1));
db_free(&dbv);
@@ -2100,7 +2100,7 @@ static INT_PTR GetVIPPort(WPARAM wParam,LPARAM lParam) if(db_get_s((HANDLE)wParam, protocolname, "VServerIP",&dbv))
return 0;
- sprintf(temp,"%s:%d",dbv.pszVal,db_get_w((HANDLE)wParam, protocolname, "VPort", -1));
+ mir_snprintf(temp, SIZEOF(temp), "%s:%d", dbv.pszVal, db_get_w((HANDLE)wParam, protocolname, "VPort", -1));
db_free(&dbv);
@@ -2142,7 +2142,7 @@ static INT_PTR GotoXFireClanSite(WPARAM wParam,LPARAM lParam) { char temp[64]="";
int clanid=db_get_dw((HANDLE)wParam, protocolname, "Clan",-1);
- sprintf(temp,"ClanUrl_%d",clanid);
+ mir_snprintf(temp, SIZEOF(temp), "ClanUrl_%d", clanid);
if(db_get_s(NULL, protocolname, temp,&dbv))
return 0;
@@ -2524,7 +2524,7 @@ void gamedetectiont(LPVOID lparam) myClient->Status(statusmessage[1]);
}
- sprintf(temp,Translate("Last game: %s playtime: %.2d:%.2d:%.2d"),currentgame->name,mytm->tm_hour,mytm->tm_min,mytm->tm_sec);
+ mir_snprintf(temp, SIZEOF(temp), Translate("Last game: %s playtime: %.2d:%.2d:%.2d"), currentgame->name, mytm->tm_hour, mytm->tm_min, mytm->tm_sec);
db_set_s(NULL, protocolname, "LastGame", temp);
if(currentgame->noicqstatus!=TRUE&&db_get_b(NULL,protocolname,"autosetstatusmsg",0))
@@ -2582,7 +2582,7 @@ void gamedetectiont(LPVOID lparam) if(packet->ip[3]!=0)
{
- sprintf(temp,"%d.%d.%d.%d:%d",(unsigned char)packet->ip[3],(unsigned char)packet->ip[2],(unsigned char)packet->ip[1],(unsigned char)packet->ip[0],packet->port);
+ mir_snprintf(temp, SIZEOF(temp), "%d.%d.%d.%d:%d", (unsigned char)packet->ip[3], (unsigned char)packet->ip[2], (unsigned char)packet->ip[1], (unsigned char)packet->ip[0], packet->port);
db_set_s(NULL, protocolname, "ServerIP", temp);
XFireLog("Got IPPort: %s",temp);
}
@@ -2922,7 +2922,7 @@ HANDLE handlingBuddys(BuddyListEntry *entry, int clan,char*group,BOOL dontscan) {
if((unsigned char)gameob->ip[3]!=0) // wenn ip, dann speichern
{
- sprintf(temp,"%d.%d.%d.%d",(unsigned char)gameob->ip[3],(unsigned char)gameob->ip[2],(unsigned char)gameob->ip[1],(unsigned char)gameob->ip[0]);
+ mir_snprintf(temp, SIZEOF(temp), "%d.%d.%d.%d", (unsigned char)gameob->ip[3], (unsigned char)gameob->ip[2], (unsigned char)gameob->ip[1], (unsigned char)gameob->ip[0]);
db_set_s(hContact, protocolname, "VServerIP", temp);
db_set_w(hContact, protocolname, "VPort", (unsigned long)gameob->port);
}
@@ -2962,7 +2962,7 @@ HANDLE handlingBuddys(BuddyListEntry *entry, int clan,char*group,BOOL dontscan) if(db_get_b(NULL,protocolname,"gamepopup",0)==1) {
char temp[256]="";
- sprintf(temp,Translate("%s is playing %s."),
+ mir_snprintf(temp, SIZEOF(temp), Translate("%s is playing %s."),
//ist ein nick gesetzt?
(entry->nick.length()==0?
//nein dann username
@@ -2975,7 +2975,7 @@ HANDLE handlingBuddys(BuddyListEntry *entry, int clan,char*group,BOOL dontscan) {
if((unsigned char)gameob->ip[3]!=0)
{
- sprintf(temp,Translate("%s is playing %s on server %d.%d.%d.%d:%d."),
+ mir_snprintf(temp, SIZEOF(temp), Translate("%s is playing %s on server %d.%d.%d.%d:%d."),
//ist ein nick gesetzt?
(entry->nick.length()==0?
//nein dann username
@@ -3025,7 +3025,7 @@ HANDLE handlingBuddys(BuddyListEntry *entry, int clan,char*group,BOOL dontscan) if((unsigned char)gameob->ip[3]!=0)
{
//ip und port in kontakt speichern
- sprintf(temp,"%d.%d.%d.%d",(unsigned char)gameob->ip[3],(unsigned char)gameob->ip[2],(unsigned char)gameob->ip[1],(unsigned char)gameob->ip[0]);
+ mir_snprintf(temp, SIZEOF(temp), "%d.%d.%d.%d", (unsigned char)gameob->ip[3], (unsigned char)gameob->ip[2], (unsigned char)gameob->ip[1], (unsigned char)gameob->ip[0]);
db_set_s(hContact, protocolname, "ServerIP", temp);
db_set_w(hContact, protocolname, "Port", (unsigned long)gameob->port);
@@ -3141,11 +3141,11 @@ HANDLE handlingBuddys(BuddyListEntry *entry, int clan,char*group,BOOL dontscan) {
char temp[256];
DBVARIANT dbv;
- sprintf_s(temp,256,"%d",val-1);
+ mir_snprintf(temp, SIZEOF(temp), "%d", val - 1);
db_get_s(NULL,"CListGroups",temp,&dbv);
if(dbv.pszVal!=NULL)
{
- sprintf_s(temp,256,"%s\\%s",&dbv.pszVal[1],group);
+ mir_snprintf(temp, SIZEOF(temp), "%s\\%s", &dbv.pszVal[1], group);
db_set_s(entry->hcontact, "CList", "Group", temp);
db_free(&dbv);
}
@@ -3164,11 +3164,11 @@ HANDLE handlingBuddys(BuddyListEntry *entry, int clan,char*group,BOOL dontscan) {
char temp[256];
DBVARIANT dbv;
- sprintf_s(temp,256,"%d",val-1);
+ mir_snprintf(temp, SIZEOF(temp), "%d", val - 1);
db_get_s(NULL,"CListGroups",temp,&dbv);
if(dbv.pszVal!=NULL)
{
- sprintf_s(temp,256,"%s\\%s",&dbv.pszVal[1],group);
+ mir_snprintf(temp, SIZEOF(temp), "%s\\%s", &dbv.pszVal[1], group);
db_set_s(entry->hcontact, "CList", "Group", temp);
db_free(&dbv);
}
@@ -3274,11 +3274,11 @@ void CreateGroup(char*grpn,char*field) { {
char temp[255];
DBVARIANT dbv;
- sprintf_s(temp,255,"%d",val-1);
+ mir_snprintf(temp, SIZEOF(temp), "%d", val - 1);
db_get_s(NULL,"CListGroups",temp,&dbv);
if(dbv.pszVal!=NULL)
{
- sprintf_s((char*)grp,255,"%s\\%s",&dbv.pszVal[1],(char*)grpn);
+ mir_snprintf((char*)grp, 255, "%s\\%s", &dbv.pszVal[1], (char*)grpn);
db_free(&dbv);
}
else //gruppe existiert nciht mehr, auf root alles legen
@@ -3294,7 +3294,7 @@ void CreateGroup(char*grpn,char*field) { int i=0;
for (i = 0;; i++)
{
- sprintf(temp,"%d",i);
+ mir_snprintf(temp, SIZEOF(temp), "%d", i);
if (db_get_s(NULL, "CListGroups", temp, &dbv))
{
i--;
@@ -3309,7 +3309,7 @@ void CreateGroup(char*grpn,char*field) { strcpy_s(group,255,"D");
strcat_s(group,255,(char*)grp);
group[0]= 1 | GROUPF_EXPANDED;
- sprintf(temp,"%d",i+1);
+ mir_snprintf(temp, SIZEOF(temp), "%d", i + 1);
db_set_s(NULL, "CListGroups", temp, group);
CallServiceSync(MS_CLUI_GROUPADDED, i + 1, 0);
}
@@ -3455,7 +3455,7 @@ INT_PTR RemoveFriend(WPARAM wParam,LPARAM lParam) { if(!db_get_s((HANDLE)wParam, protocolname, "Username",&dbv))
{
- sprintf(temp,Translate("Do you really want delete your friend %s?"),dbv.pszVal);
+ mir_snprintf(temp, SIZEOF(temp), Translate("Do you really want delete your friend %s?"), dbv.pszVal);
if(MessageBoxA(NULL,temp,Translate("Confirm Delete"),MB_YESNO|MB_ICONQUESTION)==IDYES)
{
if(myClient!=NULL)
@@ -3561,7 +3561,7 @@ int doneQuery( WPARAM wParam, LPARAM lParam ) { db_set_s(bud->hcontact, protocolname, "ServerName", gameinfo->name);
db_set_s(bud->hcontact, protocolname, "GameType", gameinfo->gametype);
db_set_s(bud->hcontact, protocolname, "Map", gameinfo->map);
- sprintf(temp,"(%d/%d)",gameinfo->players,gameinfo->maxplayers);
+ mir_snprintf(temp, SIZEOF(temp), "(%d/%d)", gameinfo->players, gameinfo->maxplayers);
db_set_s(bud->hcontact, protocolname, "Players", temp);
db_set_b(bud->hcontact, protocolname, "Passworded", gameinfo->password);
diff --git a/protocols/Xfire/src/options.cpp b/protocols/Xfire/src/options.cpp index 96d1557630..2d1fc9ea2e 100644 --- a/protocols/Xfire/src/options.cpp +++ b/protocols/Xfire/src/options.cpp @@ -186,7 +186,7 @@ static INT_PTR CALLBACK DlgProcOpts2(HWND hwndDlg, UINT msg, WPARAM wParam, LPAR }
char temp[255]="";
- sprintf(temp,"%d",db_get_b(NULL,protocolname,"protover",0x5b));
+ mir_snprintf(temp, SIZEOF(temp), "%d", db_get_b(NULL, protocolname, "protover", 0x5b));
SetDlgItemText(hwndDlg,IDC_PVER,temp);
EnableWindow(GetDlgItem(hwndDlg,IDC_LASTGAME),FALSE);
@@ -388,11 +388,11 @@ static INT_PTR CALLBACK DlgProcOpts3(HWND hwndDlg, UINT msg, WPARAM wParam, LPAR SendDlgItemMessage( hwndDlg, IDC_CLANGROUP, CB_ADDSTRING, 0, (LPARAM)TranslateT("<Root Group>" ));
SendDlgItemMessage( hwndDlg, IDC_FOFGROUP, CB_ADDSTRING, 0, (LPARAM)TranslateT("<Root Group>" ));
- sprintf_s(temp,8,"%d",gruppen_id);
+ mir_snprintf(temp, SIZEOF(temp), "%d", gruppen_id);
while(!db_get_s(NULL,"CListGroups",temp,&dbv))
{
gruppen_id++;
- sprintf_s(temp,8,"%d",gruppen_id);
+ mir_snprintf(temp, SIZEOF(temp), "%d", gruppen_id);
if(dbv.pszVal!=NULL) {
SendDlgItemMessage( hwndDlg, IDC_CLANGROUP, CB_ADDSTRING, 0, (LPARAM)&dbv.pszVal[1]);
@@ -791,7 +791,7 @@ static INT_PTR CALLBACK DlgProcOpts6(HWND hwndDlg, UINT msg, WPARAM wParam, LPAR for(int i=0;i<found;i++)
{
//id auslesen
- sprintf_s(temp,XFIRE_MAXSIZEOFGAMENAME,"gameid_%d",i);
+ mir_snprintf(temp, SIZEOF(temp), "gameid_%d", i);
int gameid=db_get_w(NULL,protocolname,temp,0);
//spielnamen auslesen
xgamelist.getGamename(gameid,temp,XFIRE_MAXSIZEOFGAMENAME);
@@ -1000,18 +1000,18 @@ static INT_PTR CALLBACK DlgProcOpts6(HWND hwndDlg, UINT msg, WPARAM wParam, LPAR //gameskip wert setzen
char temp[64]="";
- sprintf_s(temp,64,"gameskip_%d",gameid);
+ mir_snprintf(temp, SIZEOF(temp), "gameskip_%d", gameid);
CheckDlgButton(hwndDlg,IDC_DONTDETECT,db_get_b(NULL,protocolname,temp,0));
- sprintf_s(temp,64,"gamenostatus_%d",gameid);
+ mir_snprintf(temp, SIZEOF(temp), "gamenostatus_%d", gameid);
CheckDlgButton(hwndDlg,IDC_NOSTATUSMSG,db_get_b(NULL,protocolname,temp,0));
- sprintf_s(temp,64,"notinstartmenu_%d",gameid);
+ mir_snprintf(temp, SIZEOF(temp), "notinstartmenu_%d", gameid);
CheckDlgButton(hwndDlg,IDC_NOTINSTARTMENU,db_get_b(NULL,protocolname,temp,0));
//extra parameter auslesen, aber nur, wenn das spiel auch sowas unterstützt
if(xgtemp && xgtemp->haveExtraGameArgs())
{
EnableDlgItem(hwndDlg, IDC_EXTRAPARAMS, TRUE);
- sprintf_s(temp,64,"gameextraparams_%d",gameid);
+ mir_snprintf(temp, SIZEOF(temp), "gameextraparams_%d", gameid);
DBVARIANT dbv;
if(!db_get(NULL,protocolname,temp,&dbv))
{
diff --git a/protocols/Xfire/src/searching4games.cpp b/protocols/Xfire/src/searching4games.cpp index 2a0ab3b8ea..9ecf80e71b 100644 --- a/protocols/Xfire/src/searching4games.cpp +++ b/protocols/Xfire/src/searching4games.cpp @@ -254,9 +254,9 @@ void Scan4Games( LPVOID lparam ) {
//2 gameids?
if(split)
- sprintf(temp,"%i_%i",i,i2);
+ mir_snprintf(temp, SIZEOF(temp), "%i_%i", i, i2);
else
- sprintf(temp,"%i",i);
+ mir_snprintf(temp, SIZEOF(temp), "%i", i);
//MessageBoxA(0,temp,temp,0);
@@ -468,7 +468,7 @@ void Scan4Games( LPVOID lparam ) multiexe=FALSE;
for(int i=1;i<9;i++)
{
- sprintf(ret,"DetectExe[%d]",i);
+ mir_snprintf(ret, SIZEOF(ret), "DetectExe[%d]", i);
if(xfire_GetPrivateProfileString(temp, ret, "", ret2, 512, inipath))
{
char* pos=strrchr(path,'\\');
@@ -551,7 +551,7 @@ void Scan4Games( LPVOID lparam ) newgame->setString(ret2,&newgame->launchparams);
//soll alle string, welche nicht in der commandline eines spiels sein soll in einen string pakcen semikolon getrennt
- sprintf(ret,"CommandLineMustNotContain[0]");
+ mir_snprintf(ret, SIZEOF(ret), "CommandLineMustNotContain[0]");
int i=0;
while(xfire_GetPrivateProfileString(temp, ret, "", ret2, 512, inipath))
@@ -562,7 +562,7 @@ void Scan4Games( LPVOID lparam ) newgame->appendString(ret2,&newgame->notcontain);
i++;
- sprintf(ret,"CommandLineMustNotContain[%d]",i);
+ mir_snprintf(ret, SIZEOF(ret), "CommandLineMustNotContain[%d]", i);
}
newgame->setNameandIcon();
@@ -653,7 +653,7 @@ void Scan4Games( LPVOID lparam ) newgame->setstatusmsg=atoi(ret2);
//soll alle string, welche nicht in der commandline eines spiels sein soll in einen string pakcen semikolon getrennt
- sprintf(ret,"CommandLineMustNotContain[0]");
+ mir_snprintf(ret, SIZEOF(ret), "CommandLineMustNotContain[0]");
int i=0;
while(xfire_GetPrivateProfileString(temp, ret, "", ret2, 512, inipath))
@@ -664,7 +664,7 @@ void Scan4Games( LPVOID lparam ) newgame->appendString(ret2,&newgame->notcontain);
i++;
- sprintf(ret,"CommandLineMustNotContain[%d]",i);
+ mir_snprintf(ret, SIZEOF(ret), "CommandLineMustNotContain[%d]", i);
}
newgame->setNameandIcon();
@@ -726,7 +726,7 @@ void Scan4Games( LPVOID lparam ) int p=strlen(gamelist)-2;
if(p>-1)
gamelist[p]=0; //letztes koma killen
- sprintf(ret,Translate("Games found:%s%s"),"\r\n\r\n",gamelist);
+ mir_snprintf(ret, SIZEOF(ret), Translate("Games found:%s%s"), "\r\n\r\n", gamelist);
MSGBOX(ret);
}
|