From 517284b80db96b58ea68d7ba974345dc5a2236bb Mon Sep 17 00:00:00 2001 From: George Hazan Date: Thu, 2 Jan 2014 11:42:34 +0000 Subject: fix for extra icons in XFire git-svn-id: http://svn.miranda-ng.org/main/trunk@7453 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/Xfire/src/tools.cpp | 134 +++++++++++++++++++++--------------------- 1 file changed, 67 insertions(+), 67 deletions(-) (limited to 'protocols/Xfire/src/tools.cpp') diff --git a/protocols/Xfire/src/tools.cpp b/protocols/Xfire/src/tools.cpp index 80dde35cc5..da6730ca8d 100644 --- a/protocols/Xfire/src/tools.cpp +++ b/protocols/Xfire/src/tools.cpp @@ -41,7 +41,7 @@ extern HANDLE hNetlib; for(int i=0;i-1) + if (pos>-1) { char *temp=new char[strlen(src)+strlen(rep)+1]; @@ -131,19 +131,19 @@ char*menuitemtext(char*mtext) int anz=0; int j=0; - if(!mtext) + if (!mtext) return NULL; int size=strlen(mtext); - if(!size || size>255) + if (!size || size>255) return mtext; //alle & zeichen zählen for(int i=0;ith32ProcessID!=0) { + if (processInfo->th32ProcessID!=0) { int size=_tcslen(processInfo->szExeFile); - if(size==13) + if (size==13) { - if((processInfo->szExeFile[0]=='T'||processInfo->szExeFile[0]=='t')&& + if ((processInfo->szExeFile[0]=='T'||processInfo->szExeFile[0]=='t')&& processInfo->szExeFile[1]=='e'&& processInfo->szExeFile[2]=='a'&& processInfo->szExeFile[3]=='m'&& @@ -290,9 +290,9 @@ BOOL FindTeamSpeak(DWORD*pid,int*vid) { break; } } - else if(size==12) + else if (size==12) { - if((processInfo->szExeFile[0]=='V'||processInfo->szExeFile[0]=='v')&& + if ((processInfo->szExeFile[0]=='V'||processInfo->szExeFile[0]=='v')&& processInfo->szExeFile[1]=='e'&& processInfo->szExeFile[2]=='n'&& processInfo->szExeFile[3]=='t'&& @@ -307,9 +307,9 @@ BOOL FindTeamSpeak(DWORD*pid,int*vid) { break; } } - else if(size==10) + else if (size==10) { - if((processInfo->szExeFile[0]=='m'||processInfo->szExeFile[0]=='M')&& + if ((processInfo->szExeFile[0]=='m'||processInfo->szExeFile[0]=='M')&& processInfo->szExeFile[1]=='u'&& processInfo->szExeFile[2]=='m'&& processInfo->szExeFile[3]=='b'&& @@ -343,7 +343,7 @@ BOOL GetServerIPPort(DWORD pid,char*localaddrr,unsigned long localaddr,char*ip1, //DUMP("***Suche IP/Port***",""); - if(pid!=lastpid) + if (pid!=lastpid) { lastip=lastport=0; lastpid=pid; @@ -356,12 +356,12 @@ BOOL GetServerIPPort(DWORD pid,char*localaddrr,unsigned long localaddr,char*ip1, ptab=(MIB_UDPTABLE_OWNER_PID*)malloc(size); int ret = GetExtendedUdpTable(ptab, &size, FALSE, AF_INET, UDP_TABLE_OWNER_PID, 0); //alle grad geöffnet updverb nach der pid vom spiel suchen, um an den port ranzukommen - if(ret==NO_ERROR) + if (ret==NO_ERROR) { BOOL notfound=TRUE; for(unsigned int i=0;idwNumEntries;i++) { - if(ptab->table[i].dwOwningPid==pid) //spiel gefunden + if (ptab->table[i].dwOwningPid==pid) //spiel gefunden { localport.push_back(ptab->table[i].dwLocalPort); //DUMP("Localport: %d",ptab->table[i].dwLocalPort); @@ -370,7 +370,7 @@ BOOL GetServerIPPort(DWORD pid,char*localaddrr,unsigned long localaddr,char*ip1, notfound=FALSE; } } - if(notfound) //kein port gefunden + if (notfound) //kein port gefunden { //DUMP("Kein Localport gefunden",""); XFireLog("no local port found"); @@ -383,13 +383,13 @@ BOOL GetServerIPPort(DWORD pid,char*localaddrr,unsigned long localaddr,char*ip1, return FALSE; } - if(ptab) delete ptab; //speicher frei machn + if (ptab) delete ptab; //speicher frei machn //socker erstellen SOCKET s; s = socket(AF_INET, SOCK_RAW, IPPROTO_UDP); - if(s==INVALID_SOCKET) + if (s==INVALID_SOCKET) { //DUMP("Kann Rawsocket nicht erstellen. Error: %d",WSAGetLastError()); XFireLog("unable to create raw socket %d",WSAGetLastError()); @@ -427,7 +427,7 @@ BOOL GetServerIPPort(DWORD pid,char*localaddrr,unsigned long localaddr,char*ip1, //socket soll timeout auswerfen, wenn nix kommt, damit der gamethread nicht hängt //DUMP("timeout>>>",""); static int timeout=200; - if(setsockopt(s, SOL_SOCKET, SO_RCVTIMEO,(char*)&timeout, sizeof(timeout) == SOCKET_ERROR)) + if (setsockopt(s, SOL_SOCKET, SO_RCVTIMEO,(char*)&timeout, sizeof(timeout) == SOCKET_ERROR)) { XFireLog("setsockopt(SO_RCVTIMEO) error %d",WSAGetLastError()); } @@ -472,7 +472,7 @@ BOOL GetServerIPPort(DWORD pid,char*localaddrr,unsigned long localaddr,char*ip1, for (int I=0;Idstport); //DUMP("== %d",localport.at(i)); - if(temp2->dstport==localport.at(i)/*FIX: für XP SP3 ->*/&&temp4->srcip!=localaddr) //ist das ziel des packets, gleich dem port des spiels + if (temp2->dstport==localport.at(i)/*FIX: für XP SP3 ->*/&&temp4->srcip!=localaddr) //ist das ziel des packets, gleich dem port des spiels { *port=r(temp2->srcport); //ja dann serverdaten an gamethread übermitteln *ip1=temp.ip1; @@ -506,7 +506,7 @@ BOOL GetServerIPPort(DWORD pid,char*localaddrr,unsigned long localaddr,char*ip1, //DUMP("SourceIP %d",temp4->srcip); //DUMP("SourcePort %d",temp2->srcport); - if(lastip!=temp4->srcip||temp2->srcport!=lastport) + if (lastip!=temp4->srcip||temp2->srcport!=lastport) { lastport=temp2->srcport; //fixed port wechsel, damit dieser auch mitgetielt wird, wenn zb vorher nur serverinfos angefordert wurden lastip=temp4->srcip; @@ -519,7 +519,7 @@ BOOL GetServerIPPort(DWORD pid,char*localaddrr,unsigned long localaddr,char*ip1, XFireLog("no serverip found!"); return FALSE; } - /* else if(temp4->srcip==localaddr && temp2->srcport==localport.at(i)) //gesendete gamepackets + /* else if (temp4->srcip==localaddr && temp2->srcport==localport.at(i)) //gesendete gamepackets { *port=r(temp2->dstport); //ja dann serverdaten an gamethread übermitteln *ip1=temp4->ip1; @@ -531,7 +531,7 @@ BOOL GetServerIPPort(DWORD pid,char*localaddrr,unsigned long localaddr,char*ip1, }*/ } } - else if(msize==SOCKET_ERROR) + else if (msize==SOCKET_ERROR) { XFireLog("recv() error %d",WSAGetLastError()); } @@ -552,7 +552,7 @@ BOOL GetServerIPPort2(DWORD pid,char*localaddrr,unsigned long localaddr,char*ip1 static int lastpid=0; static int lastport=0; - if(pid!=lastpid) + if (pid!=lastpid) { lastip=lastport=0; lastpid=pid; @@ -565,12 +565,12 @@ BOOL GetServerIPPort2(DWORD pid,char*localaddrr,unsigned long localaddr,char*ip1 ptab=(MIB_UDPTABLE_OWNER_PID*)malloc(size); int ret = GetExtendedUdpTable(ptab, &size, FALSE, AF_INET, UDP_TABLE_OWNER_PID, 0); //alle grad geöffnet updverb nach der pid vom spiel suchen, um an den port ranzukommen - if(ret==NO_ERROR) + if (ret==NO_ERROR) { BOOL notfound=TRUE; for(unsigned int i=0;idwNumEntries;i++) { - if(ptab->table[i].dwOwningPid==pid) //spiel gefunden + if (ptab->table[i].dwOwningPid==pid) //spiel gefunden { localport.push_back(ptab->table[i].dwLocalPort); //localport=; //port wird gesichert @@ -578,9 +578,9 @@ BOOL GetServerIPPort2(DWORD pid,char*localaddrr,unsigned long localaddr,char*ip1 notfound=FALSE; } } - if(notfound) //kein port gefunden + if (notfound) //kein port gefunden { - if(lastip!=0) + if (lastip!=0) { lastip=0; lastport=0; @@ -592,7 +592,7 @@ BOOL GetServerIPPort2(DWORD pid,char*localaddrr,unsigned long localaddr,char*ip1 else return FALSE; - if(ptab) delete ptab; //speicher frei machn + if (ptab) delete ptab; //speicher frei machn //socker erstellen @@ -667,7 +667,7 @@ BOOL GetServerIPPort2(DWORD pid,char*localaddrr,unsigned long localaddr,char*ip1 for (int I=0;Idstport==localport.at(i)/*FIX: für XP SP3 ->*/&&temp4->srcip!=localaddr) //ist das ziel des packets, gleich dem port des spiels + if (temp2->dstport==localport.at(i)/*FIX: für XP SP3 ->*/&&temp4->srcip!=localaddr) //ist das ziel des packets, gleich dem port des spiels { *port=r(temp2->srcport); //ja dann serverdaten an gamethread übermitteln *ip1=temp.ip1; @@ -684,7 +684,7 @@ BOOL GetServerIPPort2(DWORD pid,char*localaddrr,unsigned long localaddr,char*ip1 *ip4=temp.ip4; closesocket(s); //socket zumachn - if(lastip!=temp4->srcip||temp2->srcport!=lastport) + if (lastip!=temp4->srcip||temp2->srcport!=lastport) { lastport=temp2->srcport; //fixed port wechsel, damit dieser auch mitgetielt wird, wenn zb vorher nur serverinfos angefordert wurden lastip=temp4->srcip; @@ -693,7 +693,7 @@ BOOL GetServerIPPort2(DWORD pid,char*localaddrr,unsigned long localaddr,char*ip1 return FALSE; } - /* else if(temp4->srcip==localaddr && temp2->srcport==localport.at(i)) //gesendete gamepackets + /* else if (temp4->srcip==localaddr && temp2->srcport==localport.at(i)) //gesendete gamepackets { *port=r(temp2->dstport); //ja dann serverdaten an gamethread übermitteln *ip1=temp4->ip1; @@ -719,7 +719,7 @@ char * getItem(char * string,char delim,int count) while(*string!='\0'&&count>0) { - if(*string==delim) + if (*string==delim) { item[i]=0; i=0; @@ -732,9 +732,9 @@ char * getItem(char * string,char delim,int count) string++; } } - if(*string=='\0') + if (*string=='\0') item[i]=0; - if(count>1) + if (count>1) item[0]=0; for(unsigned int i=0;iCommandLine.Buffer; //keine commandline?! - if(uSize==0||pBaseAddress==NULL) + if (uSize==0||pBaseAddress==NULL) { LocalFree(UserPool); return FALSE; @@ -818,7 +818,7 @@ BOOL checkCommandLine(HANDLE hProcess,char * mustcontain,char * mustnotcontain) //in ansi umwandeln int correctsize=WideCharToMultiByte(CP_OEMCP, 0, buffer, -1, NULL, 0, NULL, NULL); - if(correctsize==0) + if (correctsize==0) { LocalFree(UserPool); return FALSE; @@ -835,12 +835,12 @@ BOOL checkCommandLine(HANDLE hProcess,char * mustcontain,char * mustnotcontain) } //lowercase mustcontain/mustnotcontain - if(mustcontain) + if (mustcontain) for(unsigned int i=0;iresultCode); if (nlhrReply->resultCode != 200) { @@ -921,9 +921,9 @@ BOOL CheckWWWContent(char*address) { BOOL GetWWWContent2(char*address,char*filename,BOOL dontoverwrite,char**tobuf,unsigned int* size) { - if(dontoverwrite==TRUE) + if (dontoverwrite==TRUE) { - if(GetFileAttributesA(filename)!=0xFFFFFFFF) + if (GetFileAttributesA(filename)!=0xFFFFFFFF) { Netlib_Logf(hNetlib,"%s already exists, no overwrite.",filename); return TRUE; @@ -940,7 +940,7 @@ BOOL GetWWWContent2(char*address,char*filename,BOOL dontoverwrite,char**tobuf,un nlhrReply=(NETLIBHTTPREQUEST*)CallService(MS_NETLIB_HTTPTRANSACTION,(WPARAM)hNetlib,(LPARAM)&nlhr); - if(nlhrReply) { + if (nlhrReply) { //nicht auf dem server if (nlhrReply->resultCode != 200) { Netlib_Logf(hNetlib,"Bad statuscode: %d",nlhrReply->resultCode); @@ -956,10 +956,10 @@ BOOL GetWWWContent2(char*address,char*filename,BOOL dontoverwrite,char**tobuf,un } else { - if(tobuf==NULL) + if (tobuf==NULL) { FILE * f = fopen(filename,"wb"); - if(f==NULL) + if (f==NULL) { Netlib_Logf(hNetlib,"Cannot open %s for binary write mode.",filename); CallService(MS_NETLIB_FREEHTTPREQUESTSTRUCT,0,(LPARAM)nlhrReply); @@ -970,14 +970,14 @@ BOOL GetWWWContent2(char*address,char*filename,BOOL dontoverwrite,char**tobuf,un } else { - if(*tobuf==NULL) + if (*tobuf==NULL) { *tobuf=new char[nlhrReply->dataLength+1]; memcpy_s(*tobuf,nlhrReply->dataLength,nlhrReply->pData,nlhrReply->dataLength); //0 terminieren (*tobuf)[nlhrReply->dataLength]=0; //größe zurückliefern, wenn gewollt - if(size) + if (size) *size=nlhrReply->dataLength+1; } } @@ -1004,7 +1004,7 @@ unsigned int getfilesize(char*path) { FILE * f = NULL; f=fopen(path,"rb"); - if(f==NULL) + if (f==NULL) return 0; fseek (f, 0, SEEK_END); int size=ftell (f); @@ -1016,7 +1016,7 @@ unsigned int getfilesize(char*path) DWORD xfire_GetPrivateProfileString(__in LPCSTR lpAppName, __in LPCSTR lpKeyName, __in LPCSTR lpDefault, __out LPSTR lpReturnedString, __in DWORD nSize, __in LPCSTR lpFileName) { //xfire_games.ini int size=strlen(lpFileName); - if(size>15) + if (size>15) { char*file=(char*)lpFileName; int ret=0; @@ -1025,7 +1025,7 @@ DWORD xfire_GetPrivateProfileString(__in LPCSTR lpAppName, __in LPCSTR lpKey *(file+size-12)='e'; *(file+size-11)='r'; ret = GetPrivateProfileStringA( lpAppName,lpKeyName,lpDefault,lpReturnedString,nSize,lpFileName); - if(ret) + if (ret) { return ret; } -- cgit v1.2.3