From 44fb7e9e5fb9db8ef1876c32a2a6e296c9215c3e Mon Sep 17 00:00:00 2001 From: Tobias Weimer Date: Sun, 19 Jan 2014 20:12:04 +0000 Subject: more translation fixes git-svn-id: http://svn.miranda-ng.org/main/trunk@7771 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/Xfire/src/addgamedialog.cpp | 42 +++++++++++++++------------------ protocols/Xfire/src/iniupdater.cpp | 2 +- protocols/Xfire/src/main.cpp | 9 ++++--- protocols/Xfire/src/options.cpp | 25 ++++++++++---------- protocols/Xfire/src/searching4games.cpp | 4 ++-- protocols/Xfire/src/tools.cpp | 11 ++++----- protocols/Xfire/src/userdetails.cpp | 4 ++-- 7 files changed, 45 insertions(+), 52 deletions(-) (limited to 'protocols/Xfire/src') diff --git a/protocols/Xfire/src/addgamedialog.cpp b/protocols/Xfire/src/addgamedialog.cpp index dfd3b083e9..ae8ae1a438 100644 --- a/protocols/Xfire/src/addgamedialog.cpp +++ b/protocols/Xfire/src/addgamedialog.cpp @@ -322,7 +322,7 @@ INT_PTR CALLBACK DlgAddGameProc (HWND hwndDlg, { //nicht schließen, wenn noch der thread läuft if (dontClose) { - MessageBoxA(hwndDlg, Translate("Please wait, game.ini will be currently parsed..."), Translate("XFire Options"), MB_OK|MB_ICONEXCLAMATION); + MessageBox(hwndDlg, TranslateT("Please wait, game.ini will be currently parsed..."), TranslateT("XFire Options"), MB_OK|MB_ICONEXCLAMATION); return FALSE; } return SendMessage(GetParent(hwndDlg),WM_CLOSE,0,0); @@ -332,7 +332,7 @@ INT_PTR CALLBACK DlgAddGameProc (HWND hwndDlg, int idx=SendDlgItemMessage(hwndDlg, IDC_GAMELIST, LB_GETCURSEL, 0, 0); //es wurde was ausgewählt? if (idx==LB_ERR) { - MessageBoxA(hwndDlg,Translate("Please choose one game in the list!"),Translate("XFire Options"),MB_OK|MB_ICONEXCLAMATION); + MessageBox(hwndDlg,TranslateT("Please choose one game in the list!"),TranslateT("XFire Options"),MB_OK|MB_ICONEXCLAMATION); } else { @@ -355,11 +355,11 @@ INT_PTR CALLBACK DlgAddGameProc (HWND hwndDlg, //einige felder vorbelegen SetDlgItemTextA(hPage,IDC_ADD_NAME,ret); - SetDlgItemTextA(hPage,IDC_ADD_DETECTEXE,""); - SetDlgItemTextA(hPage,IDC_ADD_LAUNCHEREXE,""); + SetDlgItemText(hPage,IDC_ADD_DETECTEXE,_T("")); + SetDlgItemText(hPage,IDC_ADD_LAUNCHEREXE,_T("")); SetDlgItemTextA(hPage,IDC_ADD_ID,gameidtemp); - SetDlgItemTextA(hPage,IDC_ADD_STATUSMSG,""); - SetDlgItemTextA(hPage,IDC_ADD_CUSTOMPARAMS,""); + SetDlgItemText(hPage,IDC_ADD_STATUSMSG,_T("")); + SetDlgItemText(hPage,IDC_ADD_CUSTOMPARAMS,_T("")); SetDlgItemTextA(hPage,IDC_ADD_SENDID,gameidtemp); //auf customeintrag edit tab wechseln @@ -374,7 +374,7 @@ INT_PTR CALLBACK DlgAddGameProc (HWND hwndDlg, int idx=SendDlgItemMessage(hwndDlg, IDC_GAMELIST, LB_GETCURSEL, 0, 0); //es wurde was ausgewählt? if (idx==LB_ERR) { - MessageBoxA(hwndDlg,Translate("Please choose one game in the list!"),Translate("XFire Options"),MB_OK|MB_ICONEXCLAMATION); + MessageBox(hwndDlg,TranslateT("Please choose one game in the list!"),TranslateT("XFire Options"),MB_OK|MB_ICONEXCLAMATION); } else { @@ -509,7 +509,7 @@ INT_PTR CALLBACK DlgAddGameProc (HWND hwndDlg, case WM_CLOSE: //nicht schließen, wenn noch der thread läuft if (dontClose) { - MessageBoxA(hwndDlg, Translate("Please wait, game.ini will be currently parsed..."), Translate("XFire Options"), MB_OK|MB_ICONEXCLAMATION); + MessageBox(hwndDlg, TranslateT("Please wait, game.ini will be currently parsed..."), TranslateT("XFire Options"), MB_OK|MB_ICONEXCLAMATION); return FALSE; } //hauptfenster schließen @@ -520,11 +520,7 @@ INT_PTR CALLBACK DlgAddGameProc (HWND hwndDlg, } -INT_PTR CALLBACK DlgAddGameProc2 (HWND hwndDlg, - UINT uMsg, - WPARAM wParam, - LPARAM lParam -) +INT_PTR CALLBACK DlgAddGameProc2 (HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) { switch (uMsg) { @@ -532,7 +528,7 @@ INT_PTR CALLBACK DlgAddGameProc2 (HWND hwndDlg, //ein spiel wurde zum editieren geöffnet, felder alle vorbelegen if (editgame) { //add augf übernehmen umstellen - SetDlgItemTextA(hwndDlg,IDOK,Translate("Apply")); + SetDlgItemText(hwndDlg,IDOK,TranslateT("Apply")); //namen vorbelegen if (editgame->customgamename) @@ -582,11 +578,11 @@ INT_PTR CALLBACK DlgAddGameProc2 (HWND hwndDlg, { if (LOWORD(wParam) == IDC_SENDIDHELP) { - MessageBoxA(hwndDlg, Translate("If you add a mod of an Xfire supported game, then you can specify what game ID will be sent to Xfire. So if you add a Half-Life mod, you can set the Half-Life game ID and if you start the game, your Xfire buddies will see the Half-Life game icon next to your name and the game time will be tracked."), Translate("XFire Options"), MB_OK|MB_ICONASTERISK); + MessageBox(hwndDlg, TranslateT("If you add a mod of an Xfire supported game, then you can specify what game ID will be sent to Xfire. So if you add a Half-Life mod, you can set the Half-Life game ID and if you start the game, your Xfire buddies will see the Half-Life game icon next to your name and the game time will be tracked."), TranslateT("XFire Options"), MB_OK|MB_ICONASTERISK); } else if (LOWORD(wParam) == IDC_GAMEIDHELP) { - MessageBoxA(hwndDlg, Translate("Every game in Xfire needs an ID. Use a number above the last used ID to avoid problems with used IDs. Every number above 10000 should be save. This ID will not be sent to Xfire, when you start a game."), Translate("XFire Options"), MB_OK|MB_ICONASTERISK); + MessageBox(hwndDlg, TranslateT("Every game in Xfire needs an ID. Use a number above the last used ID to avoid problems with used IDs. Every number above 10000 should be save. This ID will not be sent to Xfire, when you start a game."), TranslateT("XFire Options"), MB_OK|MB_ICONASTERISK); } else if (LOWORD(wParam) == IDC_ADD_BROWSEDETECT) { @@ -608,7 +604,7 @@ INT_PTR CALLBACK DlgAddGameProc2 (HWND hwndDlg, { //nicht schließen, wenn noch der thread läuft if (dontClose) { - MessageBoxA(hwndDlg, Translate("Please wait, game.ini will be currently parsed..."), Translate("XFire Options"), MB_OK|MB_ICONEXCLAMATION); + MessageBox(hwndDlg, TranslateT("Please wait, game.ini will be currently parsed..."), TranslateT("XFire Options"), MB_OK|MB_ICONEXCLAMATION); return FALSE; } return SendMessage(GetParent(hwndDlg),WM_CLOSE,0,0); @@ -619,7 +615,7 @@ INT_PTR CALLBACK DlgAddGameProc2 (HWND hwndDlg, //fillgames sucht noch if (dontClose) { - MessageBoxA(hwndDlg, Translate("Please wait, game.ini will be currently parsed..."), Translate("XFire Options"), MB_OK|MB_ICONEXCLAMATION); + MessageBox(hwndDlg, TranslateT("Please wait, game.ini will be currently parsed..."), TranslateT("XFire Options"), MB_OK|MB_ICONEXCLAMATION); return FALSE; } @@ -636,7 +632,7 @@ INT_PTR CALLBACK DlgAddGameProc2 (HWND hwndDlg, if (!strlen(temp)) { if (!editgame) delete newgame; - return MessageBoxA(hwndDlg, Translate("Please enter a game name."), Translate("XFire Options"), MB_OK|MB_ICONEXCLAMATION); + return MessageBox(hwndDlg, TranslateT("Please enter a game name."), TranslateT("XFire Options"), MB_OK|MB_ICONEXCLAMATION); } else { @@ -651,7 +647,7 @@ INT_PTR CALLBACK DlgAddGameProc2 (HWND hwndDlg, if (!strlen(temp)) { if (!editgame) delete newgame; - return MessageBoxA(hwndDlg, Translate("Please enter a game ID."), Translate("XFire Options"), MB_OK|MB_ICONEXCLAMATION); + return MessageBox(hwndDlg, TranslateT("Please enter a game ID."), TranslateT("XFire Options"), MB_OK|MB_ICONEXCLAMATION); } else { @@ -660,13 +656,13 @@ INT_PTR CALLBACK DlgAddGameProc2 (HWND hwndDlg, if (gameid<1) { if (!editgame) delete newgame; - return MessageBoxA(hwndDlg, Translate("Please enter a game ID above 1."), Translate("XFire Options"), MB_OK|MB_ICONEXCLAMATION); + return MessageBox(hwndDlg, TranslateT("Please enter a game ID above 1."), TranslateT("XFire Options"), MB_OK|MB_ICONEXCLAMATION); } //gameid auf uniq prüfen else if (xgamelist.getGamebyGameid(gameid)) { if (!editgame) delete newgame; - return MessageBoxA(hwndDlg, Translate("This game ID is already in use."), Translate("XFire Options"), MB_OK|MB_ICONEXCLAMATION); + return MessageBox(hwndDlg, TranslateT("This game ID is already in use."), TranslateT("XFire Options"), MB_OK|MB_ICONEXCLAMATION); } //gameid zuordnen newgame->id=gameid; @@ -698,7 +694,7 @@ INT_PTR CALLBACK DlgAddGameProc2 (HWND hwndDlg, if (!strlen(temp)) { if (!editgame) delete newgame; - return MessageBoxA(hwndDlg, Translate("Please select a game exe. Note: If you don't select a launcher exe, the game exe will be used in the game start menu."), Translate("XFire Options"), MB_OK|MB_ICONEXCLAMATION); + return MessageBox(hwndDlg, TranslateT("Please select a game exe. Note: If you don't select a launcher exe, the game exe will be used in the game start menu."), TranslateT("XFire Options"), MB_OK|MB_ICONEXCLAMATION); } else { diff --git a/protocols/Xfire/src/iniupdater.cpp b/protocols/Xfire/src/iniupdater.cpp index 25d54315b6..fe47bfc4a7 100644 --- a/protocols/Xfire/src/iniupdater.cpp +++ b/protocols/Xfire/src/iniupdater.cpp @@ -105,7 +105,7 @@ void UpdateMyIcons(LPVOID dummy) { if (CheckWWWContent(request)) { - if (db_get_b(NULL,protocolname,"dontaskforupdate",0)==1||MessageBoxA(NULL,Translate("There is a new Icons.dll online, do you want to update now?"),"Miranda XFire Protocol Plugin",MB_YESNO|MB_ICONQUESTION)==IDYES) + if (db_get_b(NULL,protocolname,"dontaskforupdate",0)==1||MessageBox(NULL,TranslateT("There is a new Icons.dll online, do you want to update now?"),TranslateT("Miranda XFire Protocol Plugin"),MB_YESNO|MB_ICONQUESTION)==IDYES) { if (GetWWWContent2(request,file,FALSE)) { //altes backup löschen diff --git a/protocols/Xfire/src/main.cpp b/protocols/Xfire/src/main.cpp index df5385ec77..e57c2c91ba 100644 --- a/protocols/Xfire/src/main.cpp +++ b/protocols/Xfire/src/main.cpp @@ -857,7 +857,7 @@ INT_PTR UrlCall(WPARAM wparam,LPARAM lparam) { 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) + if (MessageBoxA(NULL,temp,Translate("Miranda XFire Protocol Plugin"),MB_YESNO|MB_ICONQUESTION)==IDYES) { if (myClient!=NULL) { @@ -1045,7 +1045,7 @@ extern "C" __declspec(dllexport) int Load(void) db_set_b(NULL,protocolname,"xfiresitegameico",1); db_set_b(NULL,protocolname,"recprotoverchg",1); - if (MessageBoxA(NULL,Translate("It seems that is the first time you use this plugin. Do you want to automatically download the latest available xfire_games.ini and icons.dll?\r\nWithout the xfire_games.ini Xfire can't detect any games on your computer."),"Miranda XFire Protocol Plugin",MB_YESNO|MB_ICONQUESTION)==IDYES) + if (MessageBox(NULL,TranslateT("It seems that is the first time you use this plugin. Do you want to automatically download the latest available xfire_games.ini and icons.dll?\r\nWithout the xfire_games.ini Xfire can't detect any games on your computer."),TranslateT("Miranda XFire Protocol Plugin"),MB_YESNO|MB_ICONQUESTION)==IDYES) { db_set_b(NULL,protocolname,"autoiniupdate",1); db_set_b(NULL,protocolname,"autoicodllupdate",1); @@ -1273,7 +1273,7 @@ extern "C" __declspec(dllexport) int Load(void) XFireLog("Wasn't able to get GetExtendedUdpTable function"); } - Icon_Register(hinstance, LPGEN("Protocols/XFire"), &icon, 1); + Icon_Register(hinstance, LPGEN("Protocols")"/"LPGEN("XFire"), &icon, 1); hExtraIcon1 = ExtraIcon_Register("xfire_game", LPGEN("XFire game icon"), "", NULL, ExtraImageApply1); hExtraIcon2 = ExtraIcon_Register("xfire_voice", LPGEN("XFire voice icon"), "", NULL, ExtraImageApply2); @@ -1366,7 +1366,6 @@ INT_PTR SendMessage(WPARAM wParam, LPARAM lParam) { CCSDATA *ccs = (CCSDATA *) lParam; PROTORECVEVENT* pre = (PROTORECVEVENT*)ccs->lParam; - ACKDATA * ack = (ACKDATA*) lParam; DBVARIANT dbv; int sended=0; @@ -3334,7 +3333,7 @@ INT_PTR BlockFriend(WPARAM wParam,LPARAM lParam) if (!db_get_s((HANDLE)wParam, protocolname, "Username",&dbv)) { - if (MessageBoxA(NULL,Translate("Block this user from ever contacting you again?"),Translate("Block Confirmation"),MB_YESNO|MB_ICONQUESTION)==IDYES) + if (MessageBox(NULL,TranslateT("Block this user from ever contacting you again?"),TranslateT("Block Confirmation"),MB_YESNO|MB_ICONQUESTION)==IDYES) { if (myClient!=NULL) { diff --git a/protocols/Xfire/src/options.cpp b/protocols/Xfire/src/options.cpp index 71514d0646..781eb81dfd 100644 --- a/protocols/Xfire/src/options.cpp +++ b/protocols/Xfire/src/options.cpp @@ -170,7 +170,6 @@ static INT_PTR CALLBACK DlgProcOpts2(HWND hwndDlg, UINT msg, WPARAM wParam, LPAR if (!db_get(NULL,protocolname,"login",&dbv)) { SetDlgItemTextA(hwndDlg,IDC_LOGIN,dbv.pszVal); - db_free(&dbv); } if (!db_get(NULL,protocolname,"Nick",&dbv)) { @@ -279,7 +278,7 @@ static INT_PTR CALLBACK DlgProcOpts2(HWND hwndDlg, UINT msg, WPARAM wParam, LPAR login[i]=tolower(login[i]); } if (mustlowercase) { - MessageBoxA(NULL,Translate("The username must be lowercase, so it will be lowercased saved."),Translate("XFire Options"),MB_OK|MB_ICONINFORMATION); + MessageBox(NULL,TranslateT("The username must be lowercase, so it will be lowercased saved."),TranslateT("XFire Options"),MB_OK|MB_ICONINFORMATION); SetDlgItemTextA(hwndDlg,IDC_LOGIN,login); } @@ -332,7 +331,7 @@ static INT_PTR CALLBACK DlgProcOpts2(HWND hwndDlg, UINT msg, WPARAM wParam, LPAR //GetDlgItemTextA(hwndDlg,IDC_PVER,str,sizeof(str)); //db_set_b(NULL,protocolname,"protover",(char)atoi(str)); - if (reconnectRequired) MessageBoxA(hwndDlg,Translate("The changes you have made require you to reconnect to the XFire network before they take effect"),Translate("XFire Options"),MB_OK|MB_ICONINFORMATION); + if (reconnectRequired) MessageBox(hwndDlg,TranslateT("The changes you have made require you to reconnect to the XFire network before they take effect"),TranslateT("XFire Options"),MB_OK|MB_ICONINFORMATION); return TRUE; } @@ -558,7 +557,7 @@ static INT_PTR CALLBACK DlgProcOpts3(HWND hwndDlg, UINT msg, WPARAM wParam, LPAR //GetDlgItemTextA(hwndDlg,IDC_PVER,str,sizeof(str)); //db_set_b(NULL,protocolname,"protover",(char)atoi(str)); - if (reconnectRequired) MessageBoxA(hwndDlg,Translate("The changes you have made require you to reconnect to the XFire network before they take effect"),Translate("XFire Options"),MB_OK|MB_ICONINFORMATION); + if (reconnectRequired) MessageBox(hwndDlg,TranslateT("The changes you have made require you to reconnect to the XFire network before they take effect"),TranslateT("XFire Options"),MB_OK|MB_ICONINFORMATION); return TRUE; } @@ -808,7 +807,7 @@ static INT_PTR CALLBACK DlgProcOpts6(HWND hwndDlg, UINT msg, WPARAM wParam, LPAR //was ausgewählt in der liste? if (idx!=LB_ERR) { //user fragen ob er das game wirklich löschen will - if (MessageBoxA(hwndDlg,Translate("Are you sure you want to remove this game?"),Translate("XFire Options"),MB_YESNO|MB_ICONQUESTION)==IDYES) { + if (MessageBox(hwndDlg,TranslateT("Are you sure you want to remove this game?"),TranslateT("XFire Options"),MB_YESNO|MB_ICONQUESTION)==IDYES) { //gameliste blocken xgamelist.Block(TRUE); //spielid auslesen @@ -834,7 +833,7 @@ static INT_PTR CALLBACK DlgProcOpts6(HWND hwndDlg, UINT msg, WPARAM wParam, LPAR } } else - MessageBoxA(hwndDlg,Translate("Please select a game."),Translate("XFire Options"),MB_OK|MB_ICONEXCLAMATION); + MessageBox(hwndDlg,TranslateT("Please select a game."),TranslateT("XFire Options"),MB_OK|MB_ICONEXCLAMATION); } else @@ -939,14 +938,14 @@ static INT_PTR CALLBACK DlgProcOpts6(HWND hwndDlg, UINT msg, WPARAM wParam, LPAR ShowWindow(GetDlgItem(hwndDlg, IDC_EDITGAME), SW_HIDE); } else - MessageBoxA(hwndDlg,Translate("Error: unknown game ID."),Translate("XFire Options"),MB_OK|MB_ICONEXCLAMATION); + MessageBox(hwndDlg,TranslateT("Error: unknown game ID."),TranslateT("XFire Options"),MB_OK|MB_ICONEXCLAMATION); //gameliste unblocken xgamelist.Block(FALSE); //gamelist neu füllen SendMessage(hwndDlg,WM_FILLGAMELIST,0,0); } else - MessageBoxA(hwndDlg,Translate("Please select a game."),Translate("XFire Options"),MB_OK|MB_ICONEXCLAMATION); + MessageBox(hwndDlg,TranslateT("Please select a game."),TranslateT("XFire Options"),MB_OK|MB_ICONEXCLAMATION); }else //wurde ein spiel aus der liste gewählt? if (HIWORD(wParam)==LBN_SELCHANGE && LOWORD(wParam)==IDC_LGAMELIST) { @@ -1016,12 +1015,12 @@ static INT_PTR CALLBACK DlgProcOpts6(HWND hwndDlg, UINT msg, WPARAM wParam, LPAR db_free(&dbv); } else - SetDlgItemTextA(hwndDlg,IDC_EXTRAPARAMS,""); + SetDlgItemText(hwndDlg,IDC_EXTRAPARAMS,_T("")); } else { EnableDlgItem(hwndDlg, IDC_EXTRAPARAMS, FALSE); - SetDlgItemTextA(hwndDlg,IDC_EXTRAPARAMS,Translate("Not supported")); + SetDlgItemText(hwndDlg,IDC_EXTRAPARAMS,TranslateT("Not supported")); } } } @@ -1069,16 +1068,16 @@ static INT_PTR CALLBACK DlgProcOpts6(HWND hwndDlg, UINT msg, WPARAM wParam, LPAR game->refreshMenuitem(); game->writeToDB(dbid); - SetDlgItemTextA(hwndDlg,IDC_TEXTSTATUS,Translate("Configuration saved!")); + SetDlgItemText(hwndDlg,IDC_TEXTSTATUS,TranslateT("Configuration saved!")); } else { - SetDlgItemTextA(hwndDlg,IDC_TEXTSTATUS,Translate("Game not found?!")); + SetDlgItemText(hwndDlg,IDC_TEXTSTATUS,TranslateT("Game not found?!")); } } else { - SetDlgItemTextA(hwndDlg,IDC_TEXTSTATUS,Translate("Game not found?!")); + SetDlgItemText(hwndDlg,IDC_TEXTSTATUS,TranslateT("Game not found?!")); } //gamelist unblocken diff --git a/protocols/Xfire/src/searching4games.cpp b/protocols/Xfire/src/searching4games.cpp index 17a11c80c1..6cd9512e8d 100644 --- a/protocols/Xfire/src/searching4games.cpp +++ b/protocols/Xfire/src/searching4games.cpp @@ -258,7 +258,7 @@ void Scan4Games( LPVOID lparam ) else mir_snprintf(temp, SIZEOF(temp), "%i", i); - //MessageBoxA(0,temp,temp,0); + //MessageBox(0,temp,temp,0); //letztes ergeniss sichern last_gpps=gpps; @@ -711,7 +711,7 @@ void Scan4Games( LPVOID lparam ) } } - if (hwnd)SetDlgItemTextA(hwnd,IDC_CURRENTGAME,Translate("Write to database...")); + if (hwnd)SetDlgItemText(hwnd,IDC_CURRENTGAME,TranslateT("Write to database...")); //gefundene games in db eintragen xgamelist.writeDatabase(); diff --git a/protocols/Xfire/src/tools.cpp b/protocols/Xfire/src/tools.cpp index da6730ca8d..1d0cd55127 100644 --- a/protocols/Xfire/src/tools.cpp +++ b/protocols/Xfire/src/tools.cpp @@ -896,13 +896,13 @@ BOOL CheckWWWContent(char*address) { Netlib_Logf(hNetlib,"Check Url %s ...",address); //netlib request - NETLIBHTTPREQUEST nlhr={0},*nlhrReply; + NETLIBHTTPREQUEST nlhr={0}; nlhr.cbSize = sizeof(nlhr); nlhr.requestType= REQUEST_HEAD; nlhr.flags = NLHRF_NODUMP|NLHRF_GENERATEHOST|NLHRF_SMARTAUTHHEADER; nlhr.szUrl = address; - nlhrReply=(NETLIBHTTPREQUEST*)CallService(MS_NETLIB_HTTPTRANSACTION,(WPARAM)hNetlib,(LPARAM)&nlhr); + NETLIBHTTPREQUEST *nlhrReply=(NETLIBHTTPREQUEST*)CallService(MS_NETLIB_HTTPTRANSACTION,(WPARAM)hNetlib,(LPARAM)&nlhr); if (nlhrReply) { //nicht auf dem server @@ -932,13 +932,13 @@ BOOL GetWWWContent2(char*address,char*filename,BOOL dontoverwrite,char**tobuf,un Netlib_Logf(hNetlib,"Download Url %s ...",address); //netlib request - NETLIBHTTPREQUEST nlhr={0},*nlhrReply; + NETLIBHTTPREQUEST nlhr={0}; nlhr.cbSize = sizeof(nlhr); nlhr.requestType= REQUEST_GET; nlhr.flags = NLHRF_NODUMP|NLHRF_GENERATEHOST|NLHRF_SMARTAUTHHEADER; nlhr.szUrl = address; - nlhrReply=(NETLIBHTTPREQUEST*)CallService(MS_NETLIB_HTTPTRANSACTION,(WPARAM)hNetlib,(LPARAM)&nlhr); + NETLIBHTTPREQUEST *nlhrReply=(NETLIBHTTPREQUEST*)CallService(MS_NETLIB_HTTPTRANSACTION,(WPARAM)hNetlib,(LPARAM)&nlhr); if (nlhrReply) { //nicht auf dem server @@ -1002,8 +1002,7 @@ BOOL GetWWWContent(char*host,char* request,char*filename,BOOL dontoverwrite) { unsigned int getfilesize(char*path) { - FILE * f = NULL; - f=fopen(path,"rb"); + FILE *f=fopen(path,"rb"); if (f==NULL) return 0; fseek (f, 0, SEEK_END); diff --git a/protocols/Xfire/src/userdetails.cpp b/protocols/Xfire/src/userdetails.cpp index c074553c24..0ae7e662f6 100644 --- a/protocols/Xfire/src/userdetails.cpp +++ b/protocols/Xfire/src/userdetails.cpp @@ -80,7 +80,7 @@ void SetItemTxt(HWND hwndDlg,int feldid,char*feld,HANDLE hcontact,int type) } else { - SetDlgItemTextA(hwndDlg,feldid,Translate("")); + SetDlgItemText(hwndDlg,feldid,TranslateT("")); EnableDlgItem(hwndDlg,feldid,FALSE); } } @@ -437,7 +437,7 @@ int OnDetailsInit(WPARAM wParam,LPARAM lParam) odp.pfnDlgProc = DlgProcUserDetails; odp.position = -1900000000; odp.pszTemplate = MAKEINTRESOURCEA(IDD_UD); - odp.pszTitle = Translate("XFire"); + odp.pszTitle = LPGEN("XFire"); UserInfo_AddPage(wParam, &odp); return 0; } \ No newline at end of file -- cgit v1.2.3