diff options
60 files changed, 202 insertions, 266 deletions
diff --git a/plugins/Alarms/src/alarms.cpp b/plugins/Alarms/src/alarms.cpp index 33c4751dc9..58e48f2278 100644 --- a/plugins/Alarms/src/alarms.cpp +++ b/plugins/Alarms/src/alarms.cpp @@ -100,7 +100,7 @@ static int PluginMessageReceived(WPARAM wParam,LPARAM lParam) TCHAR msg[1024], buff[1024];
if (_tcsncmp(ppre->tszMessage, szGamePrefix, _tcslen(szGamePrefix)))
- return CallService( MS_PROTO_CHAINRECV, wParam, lParam );
+ return CallService(MS_PROTO_CHAINRECV, wParam, lParam );
_tcsncpy(msg, ppre->tszMessage + _tcslen(szGamePrefix),SIZEOF(msg));
diff --git a/plugins/BasicHistory/src/EventList.cpp b/plugins/BasicHistory/src/EventList.cpp index 31a4f62506..75d835c288 100644 --- a/plugins/BasicHistory/src/EventList.cpp +++ b/plugins/BasicHistory/src/EventList.cpp @@ -91,7 +91,7 @@ bool EventList::CanShowHistory(DBEVENTINFO* dbei) default:
{
- DBEVENTTYPEDESCR* et = ( DBEVENTTYPEDESCR* )CallService( MS_DB_EVENT_GETTYPE, ( WPARAM )dbei->szModule, ( LPARAM )dbei->eventType );
+ DBEVENTTYPEDESCR* et = ( DBEVENTTYPEDESCR* )CallService(MS_DB_EVENT_GETTYPE, ( WPARAM )dbei->szModule, ( LPARAM )dbei->eventType );
if ( et && ( et->flags & DETF_HISTORY ))
{
return true;
diff --git a/plugins/BossKeyPlus/src/BossKey.cpp b/plugins/BossKeyPlus/src/BossKey.cpp index d155536a5e..3aa75000d9 100644 --- a/plugins/BossKeyPlus/src/BossKey.cpp +++ b/plugins/BossKeyPlus/src/BossKey.cpp @@ -231,7 +231,7 @@ TCHAR* GetDefStatusMsg(unsigned uStatus, const char* szProto) TCHAR *ret = (TCHAR *)CallService ( MS_AWAYMSG_GETSTATUSMSGT, (WPARAM)uStatus, (LPARAM)szProto );
if ( (int)ret == CALLSERVICE_NOTFOUND )
{
- char* tmp = ( char* )CallService( MS_AWAYMSG_GETSTATUSMSG, (WPARAM)uStatus, (LPARAM)szProto );
+ char* tmp = ( char* )CallService(MS_AWAYMSG_GETSTATUSMSG, (WPARAM)uStatus, (LPARAM)szProto );
ret = mir_a2t( tmp );
mir_free( tmp );
}
@@ -439,7 +439,7 @@ LRESULT CALLBACK ListenWndProc(HWND hWnd,UINT uMsg,WPARAM wParam,LPARAM lParam) strncpy(g_password, dbVar.pszVal, MAXPASSLEN);
db_free(&dbVar);
- CallService( MS_DB_CRYPT_DECODESTRING, MAXPASSLEN+1, ( LPARAM )g_password );
+ CallService(MS_DB_CRYPT_DECODESTRING, MAXPASSLEN+1, ( LPARAM )g_password );
int res = DialogBox(g_hInstance,(MAKEINTRESOURCE(IDD_PASSDIALOGNEW)),GetForegroundWindow(),(DLGPROC)DlgStdInProc);
diff --git a/plugins/BossKeyPlus/src/Options.cpp b/plugins/BossKeyPlus/src/Options.cpp index dc0f1d5636..1a843001b7 100644 --- a/plugins/BossKeyPlus/src/Options.cpp +++ b/plugins/BossKeyPlus/src/Options.cpp @@ -71,7 +71,7 @@ INT_PTR CALLBACK MainOptDlg(HWND hwndDlg,UINT msg,WPARAM wParam,LPARAM lParam) if (!db_get_s(NULL,MOD_NAME,"password",&dbVar))
{
- CallService( MS_DB_CRYPT_DECODESTRING, strlen( dbVar.pszVal )+1, ( LPARAM )dbVar.pszVal );
+ CallService(MS_DB_CRYPT_DECODESTRING, strlen( dbVar.pszVal )+1, ( LPARAM )dbVar.pszVal );
SetDlgItemTextA(hwndDlg,IDC_MAINOPT_PASS,dbVar.pszVal);
db_free(&dbVar);
@@ -133,7 +133,7 @@ INT_PTR CALLBACK MainOptDlg(HWND hwndDlg,UINT msg,WPARAM wParam,LPARAM lParam) char szPass[MAXPASSLEN+1];
GetDlgItemTextA(hwndDlg,IDC_MAINOPT_PASS,szPass,MAXPASSLEN+1);
if (strlen(szPass) != 0){
- CallService( MS_DB_CRYPT_ENCODESTRING, MAXPASSLEN+1, ( LPARAM )szPass );
+ CallService(MS_DB_CRYPT_ENCODESTRING, MAXPASSLEN+1, ( LPARAM )szPass );
db_set_s(NULL,MOD_NAME,"password",szPass);
wMask |= OPT_REQPASS;
}
diff --git a/plugins/Clist_blind/src/clistopts.cpp b/plugins/Clist_blind/src/clistopts.cpp index d7811cb19b..c0e88f04a2 100644 --- a/plugins/Clist_blind/src/clistopts.cpp +++ b/plugins/Clist_blind/src/clistopts.cpp @@ -123,7 +123,7 @@ static INT_PTR CALLBACK DlgProcGenOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LP char szName[64];
DBVARIANT dbv = { DBVT_DELETED };
db_get(NULL, "CList", "PrimaryStatus", &dbv);
- CallService( MS_PROTO_ENUMACCOUNTS, (WPARAM)&count, (LPARAM)&accs);
+ CallService(MS_PROTO_ENUMACCOUNTS, (WPARAM)&count, (LPARAM)&accs);
item = SendDlgItemMessage(hwndDlg, IDC_PRIMARYSTATUS, CB_ADDSTRING, 0, (LPARAM) TranslateT("Global"));
SendDlgItemMessage(hwndDlg, IDC_PRIMARYSTATUS, CB_SETITEMDATA, item, (LPARAM) 0);
for (i = 0; i < count; i++) {
diff --git a/plugins/Clist_modern/src/modern_clcopts.cpp b/plugins/Clist_modern/src/modern_clcopts.cpp index f2b2f7f7ec..8866f1f071 100644 --- a/plugins/Clist_modern/src/modern_clcopts.cpp +++ b/plugins/Clist_modern/src/modern_clcopts.cpp @@ -220,7 +220,7 @@ void GetFontSetting(int i,LOGFONT *lf,COLORREF *colour,BYTE *effect, COLORREF *e _tcsncpy( fontid.group, fontOptionsList[index].szGroup, SIZEOF( fontid.group ));
_tcsncpy( fontid.name, fontOptionsList[index].szDescr, SIZEOF( fontid.name ));
- COLORREF col = CallService( MS_FONT_GETT, (WPARAM)&fontid, (LPARAM)lf );
+ COLORREF col = CallService(MS_FONT_GETT, (WPARAM)&fontid, (LPARAM)lf );
if ( colour )
*colour = col;
diff --git a/plugins/Clist_modern/src/modern_clcpaint.cpp b/plugins/Clist_modern/src/modern_clcpaint.cpp index cb56dfbee8..7ae0f488bc 100644 --- a/plugins/Clist_modern/src/modern_clcpaint.cpp +++ b/plugins/Clist_modern/src/modern_clcpaint.cpp @@ -1421,7 +1421,7 @@ void CLCPaint::_PaintRowItemsEx( HWND hwnd, HDC hdcMem, ClcData *dat, ClcContact adr.radius = round_radius;
adr.alpha = blendmode;
- CallService( MS_AV_DRAWAVATAR, 0, (LPARAM) &adr );
+ CallService(MS_AV_DRAWAVATAR, 0, (LPARAM) &adr );
}
else
*/
diff --git a/plugins/Clist_modern/src/modern_clui.cpp b/plugins/Clist_modern/src/modern_clui.cpp index ee9ce018ed..51574a5b66 100644 --- a/plugins/Clist_modern/src/modern_clui.cpp +++ b/plugins/Clist_modern/src/modern_clui.cpp @@ -457,13 +457,13 @@ HRESULT CLUI::CreateCLC() nLastRequiredHeight = 0;
if (g_CluiData.current_viewmode[0] == '\0') {
if (bOldHideOffline != (BYTE)-1)
- CallService( MS_CLIST_SETHIDEOFFLINE,(WPARAM)bOldHideOffline, 0);
+ CallService(MS_CLIST_SETHIDEOFFLINE,(WPARAM)bOldHideOffline, 0);
else
- CallService( MS_CLIST_SETHIDEOFFLINE, 0, 0);
+ CallService(MS_CLIST_SETHIDEOFFLINE, 0, 0);
if (bOldUseGroups != (BYTE)-1)
- CallService( MS_CLIST_SETUSEGROUPS ,(WPARAM)bOldUseGroups, 0);
+ CallService(MS_CLIST_SETUSEGROUPS ,(WPARAM)bOldUseGroups, 0);
else
- CallService( MS_CLIST_SETUSEGROUPS ,(WPARAM)bOldUseGroups, 0);
+ CallService(MS_CLIST_SETUSEGROUPS ,(WPARAM)bOldUseGroups, 0);
}
nLastRequiredHeight = 0;
mutex_bDisableAutoUpdate = 0;
@@ -1710,8 +1710,8 @@ LRESULT CLUI::PreProcessWndProc(UINT msg, WPARAM wParam, LPARAM lParam, BOOL& bH if (hView)
{
char szFilePath[MAX_PATH], szProfile[MAX_PATH];
- CallService( MS_DB_GETPROFILEPATH,MAX_PATH,(LPARAM)&szFilePath );
- CallService( MS_DB_GETPROFILENAME,MAX_PATH,(LPARAM)&szProfile );
+ CallService(MS_DB_GETPROFILEPATH,MAX_PATH,(LPARAM)&szFilePath );
+ CallService(MS_DB_GETPROFILENAME,MAX_PATH,(LPARAM)&szProfile );
_snprintf((char*)hView, MAX_PATH, "%s\\%s", szFilePath, szProfile );
UnmapViewOfFile( hView );
rc = 1;
@@ -1975,7 +1975,7 @@ LRESULT CLUI::OnInitMenu(UINT /*msg*/, WPARAM /*wParam*/, LPARAM /*lParam*/ ) {
if ( !CLUI::IsMainMenuInited()) {
if ( ServiceExists( MS_CLIST_MENUBUILDMAIN ))
- CallService( MS_CLIST_MENUBUILDMAIN, 0, 0 );
+ CallService(MS_CLIST_MENUBUILDMAIN, 0, 0 );
CLUI::m_fMainMenuInited = TRUE;
}
return FALSE;
@@ -2139,7 +2139,7 @@ LRESULT CLUI::OnParentNotify(UINT msg, WPARAM wParam, LPARAM lParam) LRESULT CLUI::OnSetFocus(UINT msg, WPARAM wParam, LPARAM lParam)
{
- if ( hFrameContactTree && ( !CallService( MS_CLIST_FRAMES_GETFRAMEOPTIONS, MAKEWPARAM( FO_FLOATING, hFrameContactTree ), 0 )))
+ if ( hFrameContactTree && ( !CallService(MS_CLIST_FRAMES_GETFRAMEOPTIONS, MAKEWPARAM( FO_FLOATING, hFrameContactTree ), 0 )))
SetFocus(pcli->hwndContactTree);
return FALSE;
@@ -2635,7 +2635,7 @@ LRESULT CLUI::OnMeasureItem(UINT msg, WPARAM wParam, LPARAM lParam) ReleaseDC( m_hWnd, hdc );
return TRUE;
}
- return CallService( MS_CLIST_MENUMEASUREITEM, wParam, lParam);
+ return CallService(MS_CLIST_MENUMEASUREITEM, wParam, lParam);
}
LRESULT CLUI::OnDrawItem(UINT msg, WPARAM wParam, LPARAM lParam)
diff --git a/plugins/Clist_modern/src/modern_cluiframes.cpp b/plugins/Clist_modern/src/modern_cluiframes.cpp index 093a075e0a..bbf1f7af69 100644 --- a/plugins/Clist_modern/src/modern_cluiframes.cpp +++ b/plugins/Clist_modern/src/modern_cluiframes.cpp @@ -3890,31 +3890,31 @@ int CLUIFrameOnModulesUnload(WPARAM wParam,LPARAM lParam) if ( !_hmiVisible)
return 0;
- CallService( MS_CLIST_REMOVECONTEXTFRAMEMENUITEM, (LPARAM)_hmiVisible, 1 );
- CallService( MS_CLIST_REMOVECONTEXTFRAMEMENUITEM, (LPARAM)_hmiTBVisible, 1 );
- CallService( MS_CLIST_REMOVECONTEXTFRAMEMENUITEM, (LPARAM)_hmiLock, 1 );
- CallService( MS_CLIST_REMOVECONTEXTFRAMEMENUITEM, (LPARAM)_hmiColl, 1 );
- CallService( MS_CLIST_REMOVECONTEXTFRAMEMENUITEM, (LPARAM)_hmiFloating, 1 );
- CallService( MS_CLIST_REMOVECONTEXTFRAMEMENUITEM, (LPARAM)_hmiAlignTop, 1 );
- CallService( MS_CLIST_REMOVECONTEXTFRAMEMENUITEM, (LPARAM)_hmiAlignClient, 1 );
- CallService( MS_CLIST_REMOVECONTEXTFRAMEMENUITEM, (LPARAM)_hmiAlignBottom, 1 );
- CallService( MS_CLIST_REMOVECONTEXTFRAMEMENUITEM, (LPARAM)_hmiBorder, 1 );
- CallService( MS_CLIST_REMOVECONTEXTFRAMEMENUITEM, (LPARAM)_hmiAlignRoot, 1 );
-
-
- CallService( MS_CLIST_REMOVECONTEXTFRAMEMENUITEM, (LPARAM)_hmiPosUp, 1 );
- CallService( MS_CLIST_REMOVECONTEXTFRAMEMENUITEM, (LPARAM)_hmiPosDown, 1 );
- CallService( MS_CLIST_REMOVECONTEXTFRAMEMENUITEM, (LPARAM)_hmiPosRoot, 1 );
-
-
- CallService( MO_REMOVEMENUITEM, (LPARAM)_hmiVisible, 1 );
- CallService( MO_REMOVEMENUITEM, (LPARAM)_hmiTBVisible, 1 );
- CallService( MO_REMOVEMENUITEM, (LPARAM)_hmiLock, 1 );
- CallService( MO_REMOVEMENUITEM, (LPARAM)_hmiColl, 1 );
- CallService( MO_REMOVEMENUITEM, (LPARAM)_hmiFloating, 1 );
- CallService( MO_REMOVEMENUITEM, (LPARAM)_hmiBorder, 1 );
- CallService( MO_REMOVEMENUITEM, (LPARAM)_hmiAlignRoot, 1 );
- CallService( MO_REMOVEMENUITEM, (LPARAM)_hmiPosRoot, 1 );
+ CallService(MS_CLIST_REMOVECONTEXTFRAMEMENUITEM, (LPARAM)_hmiVisible, 1 );
+ CallService(MS_CLIST_REMOVECONTEXTFRAMEMENUITEM, (LPARAM)_hmiTBVisible, 1 );
+ CallService(MS_CLIST_REMOVECONTEXTFRAMEMENUITEM, (LPARAM)_hmiLock, 1 );
+ CallService(MS_CLIST_REMOVECONTEXTFRAMEMENUITEM, (LPARAM)_hmiColl, 1 );
+ CallService(MS_CLIST_REMOVECONTEXTFRAMEMENUITEM, (LPARAM)_hmiFloating, 1 );
+ CallService(MS_CLIST_REMOVECONTEXTFRAMEMENUITEM, (LPARAM)_hmiAlignTop, 1 );
+ CallService(MS_CLIST_REMOVECONTEXTFRAMEMENUITEM, (LPARAM)_hmiAlignClient, 1 );
+ CallService(MS_CLIST_REMOVECONTEXTFRAMEMENUITEM, (LPARAM)_hmiAlignBottom, 1 );
+ CallService(MS_CLIST_REMOVECONTEXTFRAMEMENUITEM, (LPARAM)_hmiBorder, 1 );
+ CallService(MS_CLIST_REMOVECONTEXTFRAMEMENUITEM, (LPARAM)_hmiAlignRoot, 1 );
+
+
+ CallService(MS_CLIST_REMOVECONTEXTFRAMEMENUITEM, (LPARAM)_hmiPosUp, 1 );
+ CallService(MS_CLIST_REMOVECONTEXTFRAMEMENUITEM, (LPARAM)_hmiPosDown, 1 );
+ CallService(MS_CLIST_REMOVECONTEXTFRAMEMENUITEM, (LPARAM)_hmiPosRoot, 1 );
+
+
+ CallService(MO_REMOVEMENUITEM, (LPARAM)_hmiVisible, 1 );
+ CallService(MO_REMOVEMENUITEM, (LPARAM)_hmiTBVisible, 1 );
+ CallService(MO_REMOVEMENUITEM, (LPARAM)_hmiLock, 1 );
+ CallService(MO_REMOVEMENUITEM, (LPARAM)_hmiColl, 1 );
+ CallService(MO_REMOVEMENUITEM, (LPARAM)_hmiFloating, 1 );
+ CallService(MO_REMOVEMENUITEM, (LPARAM)_hmiBorder, 1 );
+ CallService(MO_REMOVEMENUITEM, (LPARAM)_hmiAlignRoot, 1 );
+ CallService(MO_REMOVEMENUITEM, (LPARAM)_hmiPosRoot, 1 );
_hmiVisible = 0;
return 0;
diff --git a/plugins/Clist_modern/src/modern_skinengine.cpp b/plugins/Clist_modern/src/modern_skinengine.cpp index 303df1c769..74b39ef932 100644 --- a/plugins/Clist_modern/src/modern_skinengine.cpp +++ b/plugins/Clist_modern/src/modern_skinengine.cpp @@ -1903,7 +1903,7 @@ static HBITMAP ske_LoadGlyphImage_Png2Dib(const TCHAR *tszFilename) param.pSource = ppMap;
param.cbSourceSize = cbFileSize;
param.pResult = &pDib;
- if ( CallService( MS_PNG2DIB, 0, (LPARAM)¶m ))
+ if ( CallService(MS_PNG2DIB, 0, (LPARAM)¶m ))
pDibBits = ( BYTE* )( pDib+1 );
else
cbFileSize = 0;
@@ -2388,7 +2388,7 @@ BOOL ske_TextOutA(HDC hdc, int x, int y, char * lpString, int nCount) {
TCHAR *buf = (TCHAR *)mir_alloc((2+nCount)*sizeof(TCHAR));
BOOL res;
- MultiByteToWideChar(CallService( MS_LANGPACK_GETCODEPAGE, 0, 0 ), 0, lpString, -1, buf, (2+nCount)*sizeof(TCHAR));
+ MultiByteToWideChar(CallService(MS_LANGPACK_GETCODEPAGE, 0, 0 ), 0, lpString, -1, buf, (2+nCount)*sizeof(TCHAR));
res = ske_TextOut(hdc,x,y,buf,nCount);
mir_free(buf);
return res;
diff --git a/plugins/Clist_modern/src/modern_statusbar.cpp b/plugins/Clist_modern/src/modern_statusbar.cpp index 7f4033bfe7..a1bf2e2b43 100644 --- a/plugins/Clist_modern/src/modern_statusbar.cpp +++ b/plugins/Clist_modern/src/modern_statusbar.cpp @@ -618,7 +618,7 @@ static BOOL _ModernStatus_OnExtraIconClick(int protoIndex) return FALSE;
POINT pt; GetCursorPos( &pt );
- HWND hWnd = (HWND) CallService( MS_CLUI_GETHWND, 0 ,0 );
+ HWND hWnd = (HWND) CallService(MS_CLUI_GETHWND, 0 ,0 );
TrackPopupMenu( hExtraStatusMenu, TPM_TOPALIGN|TPM_LEFTALIGN|TPM_LEFTBUTTON, pt.x, pt.y, 0, hWnd, NULL );
return TRUE;
}
diff --git a/plugins/Clist_modern/src/modern_viewmodebar.cpp b/plugins/Clist_modern/src/modern_viewmodebar.cpp index b9d9a5748c..a0a34b313f 100644 --- a/plugins/Clist_modern/src/modern_viewmodebar.cpp +++ b/plugins/Clist_modern/src/modern_viewmodebar.cpp @@ -1333,7 +1333,7 @@ void ApplyViewMode(const char *Name, bool onlySelector ) db_unset(NULL,CLVM_MODULE,szSetting);
}
if ( g_CluiData.bOldUseGroups != (BYTE) -1 )
- CallService( MS_CLIST_SETUSEGROUPS, (WPARAM)g_CluiData.bOldUseGroups, 0 );
+ CallService(MS_CLIST_SETUSEGROUPS, (WPARAM)g_CluiData.bOldUseGroups, 0 );
pcli->pfnClcBroadcast(CLM_AUTOREBUILD, 0, 0);
KillTimer(g_hwndViewModeFrame, TIMERID_VIEWMODEEXPIRE);
diff --git a/plugins/Clist_mw/src/CLUIFrames/cluiframes.cpp b/plugins/Clist_mw/src/CLUIFrames/cluiframes.cpp index a1a6acf2c3..e287b491b0 100644 --- a/plugins/Clist_mw/src/CLUIFrames/cluiframes.cpp +++ b/plugins/Clist_mw/src/CLUIFrames/cluiframes.cpp @@ -2826,17 +2826,17 @@ static int CLUIFrameOnModulesLoad(WPARAM wParam,LPARAM lParam) static int CLUIFrameOnModulesUnload(WPARAM wParam,LPARAM lParam)
{
- CallService( MS_CLIST_REMOVECONTEXTFRAMEMENUITEM, ( LPARAM )contMIVisible, 0 );
- CallService( MS_CLIST_REMOVECONTEXTFRAMEMENUITEM, ( LPARAM )contMITitle, 0 );
- CallService( MS_CLIST_REMOVECONTEXTFRAMEMENUITEM, ( LPARAM )contMITBVisible, 0 );
- CallService( MS_CLIST_REMOVECONTEXTFRAMEMENUITEM, ( LPARAM )contMILock, 0 );
- CallService( MS_CLIST_REMOVECONTEXTFRAMEMENUITEM, ( LPARAM )contMIColl, 0 );
- CallService( MS_CLIST_REMOVECONTEXTFRAMEMENUITEM, ( LPARAM )contMIFloating, 0 );
- CallService( MS_CLIST_REMOVECONTEXTFRAMEMENUITEM, ( LPARAM )contMIAlignRoot, 0 );
- CallService( MS_CLIST_REMOVECONTEXTFRAMEMENUITEM, ( LPARAM )contMIAlignTop, 0 );
- CallService( MS_CLIST_REMOVECONTEXTFRAMEMENUITEM, ( LPARAM )contMIAlignClient, 0 );
- CallService( MS_CLIST_REMOVECONTEXTFRAMEMENUITEM, ( LPARAM )contMIAlignBottom, 0 );
- CallService( MS_CLIST_REMOVECONTEXTFRAMEMENUITEM, ( LPARAM )contMIBorder, 0 );
+ CallService(MS_CLIST_REMOVECONTEXTFRAMEMENUITEM, ( LPARAM )contMIVisible, 0 );
+ CallService(MS_CLIST_REMOVECONTEXTFRAMEMENUITEM, ( LPARAM )contMITitle, 0 );
+ CallService(MS_CLIST_REMOVECONTEXTFRAMEMENUITEM, ( LPARAM )contMITBVisible, 0 );
+ CallService(MS_CLIST_REMOVECONTEXTFRAMEMENUITEM, ( LPARAM )contMILock, 0 );
+ CallService(MS_CLIST_REMOVECONTEXTFRAMEMENUITEM, ( LPARAM )contMIColl, 0 );
+ CallService(MS_CLIST_REMOVECONTEXTFRAMEMENUITEM, ( LPARAM )contMIFloating, 0 );
+ CallService(MS_CLIST_REMOVECONTEXTFRAMEMENUITEM, ( LPARAM )contMIAlignRoot, 0 );
+ CallService(MS_CLIST_REMOVECONTEXTFRAMEMENUITEM, ( LPARAM )contMIAlignTop, 0 );
+ CallService(MS_CLIST_REMOVECONTEXTFRAMEMENUITEM, ( LPARAM )contMIAlignClient, 0 );
+ CallService(MS_CLIST_REMOVECONTEXTFRAMEMENUITEM, ( LPARAM )contMIAlignBottom, 0 );
+ CallService(MS_CLIST_REMOVECONTEXTFRAMEMENUITEM, ( LPARAM )contMIBorder, 0 );
return 0;
}
diff --git a/plugins/FloatingContacts/src/filedrop.cpp b/plugins/FloatingContacts/src/filedrop.cpp index a08a1d7fbe..87a6c1afe3 100644 --- a/plugins/FloatingContacts/src/filedrop.cpp +++ b/plugins/FloatingContacts/src/filedrop.cpp @@ -185,7 +185,7 @@ BOOL OnDropFiles( HDROP hDrop, ThumbInfo *pThumb ) ProcessDroppedItems( ppDroppedItems, nDroppedItemsCount, ppFiles );
- BOOL bSuccess = (BOOL)CallService( MS_CLIST_CONTACTFILESDROPPED, (WPARAM)pThumb->hContact, (LPARAM)ppFiles );
+ BOOL bSuccess = (BOOL)CallService(MS_CLIST_CONTACTFILESDROPPED, (WPARAM)pThumb->hContact, (LPARAM)ppFiles );
// Cleanup
for (UINT iItem = 0; ppDroppedItems[ iItem ]; ++iItem )
diff --git a/plugins/FloatingContacts/src/main.cpp b/plugins/FloatingContacts/src/main.cpp index 54ac718701..a3862997e0 100644 --- a/plugins/FloatingContacts/src/main.cpp +++ b/plugins/FloatingContacts/src/main.cpp @@ -175,7 +175,7 @@ static int OnContactDrag( WPARAM wParam, LPARAM lParam ) ThumbInfo *pNewThumb = NULL;
HANDLE hContact = ( HANDLE )wParam;
ThumbInfo *pThumb = thumbList.FindThumbByContact( hContact );
- TCHAR *ptName = (TCHAR*)CallService( MS_CLIST_GETCONTACTDISPLAYNAME, wParam, (LPARAM)GCDNF_TCHAR );
+ TCHAR *ptName = (TCHAR*)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, wParam, (LPARAM)GCDNF_TCHAR );
int idStatus = ID_STATUS_OFFLINE;
POINT pt;
GetCursorPos(&pt);
@@ -240,7 +240,7 @@ static int OnContactDragStop( WPARAM wParam, LPARAM lParam ) static int OnSkinIconsChanged( WPARAM wParam, LPARAM lParam )
{
// Get handle to the image list
- himl = ( HIMAGELIST )CallService( MS_CLIST_GETICONSIMAGELIST, 0, 0 );
+ himl = ( HIMAGELIST )CallService(MS_CLIST_GETICONSIMAGELIST, 0, 0 );
// Update thumbs
for (int i = 0; i < thumbList.getCount(); ++i)
@@ -369,7 +369,7 @@ void SendMsgDialog( HWND hwnd, TCHAR *pText ) ThumbInfo *pThumb = thumbList.FindThumb( hwnd );
if ( pThumb != NULL )
- CallService( MS_MSG_SENDMESSAGET, (WPARAM)pThumb->hContact, (LPARAM)pText );
+ CallService(MS_MSG_SENDMESSAGET, (WPARAM)pThumb->hContact, (LPARAM)pText );
}
@@ -379,12 +379,12 @@ static void ShowContactMenu( HWND hwnd, POINT pt ) if ( pThumb != NULL )
{
- hContactMenu = (HMENU)CallService( MS_CLIST_MENUBUILDCONTACT, (WPARAM)pThumb->hContact, 0 );
+ hContactMenu = (HMENU)CallService(MS_CLIST_MENUBUILDCONTACT, (WPARAM)pThumb->hContact, 0 );
if ( hContactMenu == NULL ) return;
int idCommand = TrackPopupMenu( hContactMenu, TPM_RIGHTALIGN | TPM_TOPALIGN | TPM_RETURNCMD, pt.x, pt.y, 0 , hwnd, NULL );
- CallService( MS_CLIST_MENUPROCESSCOMMAND, MAKEWPARAM( idCommand , MPCF_CONTACTMENU), (LPARAM)pThumb->hContact );
+ CallService(MS_CLIST_MENUPROCESSCOMMAND, MAKEWPARAM( idCommand , MPCF_CONTACTMENU), (LPARAM)pThumb->hContact );
}
}
@@ -477,7 +477,7 @@ static LRESULT __stdcall CommWndProc( HWND hwnd, case WM_REFRESH_CONTACT:
if (pThumb)
{
- _tcsncpy( pThumb->ptszName, (TCHAR*)CallService( MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM)pThumb->hContact, (LPARAM)GCDNF_TCHAR ), USERNAME_LEN - 1 );
+ _tcsncpy( pThumb->ptszName, (TCHAR*)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM)pThumb->hContact, (LPARAM)GCDNF_TCHAR ), USERNAME_LEN - 1 );
pThumb->RefreshContactStatus( (int)lParam );
pThumb->ResizeThumb();
}
@@ -869,7 +869,7 @@ static void LoadContact( HANDLE hContact ) DWORD dwPos = db_get_dw( hContact, MODULE, "ThumbsPos", (DWORD)-1 );
if ( dwPos != -1 ) {
- TCHAR *ptName = (TCHAR*)CallService( MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM)hContact, (LPARAM)GCDNF_TCHAR );
+ TCHAR *ptName = (TCHAR*)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM)hContact, (LPARAM)GCDNF_TCHAR );
if ( ptName != NULL ) {
int nX = DB_POS_GETX( dwPos );
int nY = DB_POS_GETY( dwPos );
diff --git a/plugins/FloatingContacts/src/thumbs.cpp b/plugins/FloatingContacts/src/thumbs.cpp index c75ff5c756..36c010beb9 100644 --- a/plugins/FloatingContacts/src/thumbs.cpp +++ b/plugins/FloatingContacts/src/thumbs.cpp @@ -290,7 +290,7 @@ void ThumbInfo::ResizeThumb() ThumbInfo *pNextThumb = NULL;
- himl = ( HIMAGELIST )CallService( MS_CLIST_GETICONSIMAGELIST, 0, 0 );
+ himl = ( HIMAGELIST )CallService(MS_CLIST_GETICONSIMAGELIST, 0, 0 );
if ( himl == NULL ) return;
@@ -381,7 +381,7 @@ void ThumbInfo::RefreshContactIcon(int iIcon) {
if ( iIcon == 0xFFFFFFFF || ImageList_GetImageCount(himl)<=iIcon )
{
- this->iIcon = CallService( MS_CLIST_GETCONTACTICON, (WPARAM)hContact, 0 );
+ this->iIcon = CallService(MS_CLIST_GETCONTACTICON, (WPARAM)hContact, 0 );
}
else
{
@@ -830,7 +830,7 @@ void ThumbInfo::UpdateContent() void ThumbInfo::PopupMessageDialog( )
{
- CallService( MS_CLIST_CONTACTDOUBLECLICKED, (WPARAM)hContact, 0 );
+ CallService(MS_CLIST_CONTACTDOUBLECLICKED, (WPARAM)hContact, 0 );
}
void ThumbInfo::OnTimer(BYTE idTimer)
diff --git a/plugins/MirOTR/MirOTR/src/mirotrmenu.cpp b/plugins/MirOTR/MirOTR/src/mirotrmenu.cpp index 6ed476f1cf..dfd28d741f 100644 --- a/plugins/MirOTR/MirOTR/src/mirotrmenu.cpp +++ b/plugins/MirOTR/MirOTR/src/mirotrmenu.cpp @@ -278,6 +278,6 @@ void UninitMirOTRMenu(void) DestroyWindow(hDummyPaintWin);
hDummyPaintWin = 0;
UnregisterClass(_T("MirOTRPopupMenuProcessor"), hInst);
- if ( hMirOTRMenuObject ) CallService( MO_REMOVEMENUOBJECT, (WPARAM)hMirOTRMenuObject, 0 );
+ if ( hMirOTRMenuObject ) CallService(MO_REMOVEMENUOBJECT, (WPARAM)hMirOTRMenuObject, 0 );
hMirOTRMenuObject = 0;
}
diff --git a/plugins/Nudge/src/main.cpp b/plugins/Nudge/src/main.cpp index 70e4bf301e..144a585c07 100644 --- a/plugins/Nudge/src/main.cpp +++ b/plugins/Nudge/src/main.cpp @@ -484,7 +484,7 @@ void Nudge_SentStatus(CNudgeElement n, HANDLE hContact) NudgeEvent.cbBlob = (DWORD)strlen(buff) + 1;
NudgeEvent.pBlob = ( PBYTE ) buff;
- INT_PTR res = CallService( MS_MC_GETMETACONTACT, (WPARAM)hContact, 0 ); //try to retrieve the metacontact if some
+ INT_PTR res = CallService(MS_MC_GETMETACONTACT, (WPARAM)hContact, 0 ); //try to retrieve the metacontact if some
if(res != CALLSERVICE_NOTFOUND) {
HANDLE hMetaContact = (HANDLE) res;
if(hMetaContact != NULL) //metacontact
@@ -510,7 +510,7 @@ void Nudge_ShowStatus(CNudgeElement n, HANDLE hContact, DWORD timestamp) NudgeEvent.pBlob = ( PBYTE ) buff;
- INT_PTR res = CallService( MS_MC_GETMETACONTACT, (WPARAM)hContact, 0 ); //try to retrieve the metacontact if some
+ INT_PTR res = CallService(MS_MC_GETMETACONTACT, (WPARAM)hContact, 0 ); //try to retrieve the metacontact if some
if(res != CALLSERVICE_NOTFOUND) {
HANDLE hMetaContact = (HANDLE) res;
if(hMetaContact != NULL) { //metacontact
@@ -524,7 +524,7 @@ void Nudge_ShowStatus(CNudgeElement n, HANDLE hContact, DWORD timestamp) HANDLE Nudge_GethContact(HANDLE hContact)
{
- INT_PTR res = CallService( MS_MC_GETMETACONTACT, (WPARAM)hContact, 0 );
+ INT_PTR res = CallService(MS_MC_GETMETACONTACT, (WPARAM)hContact, 0 );
if(res!=CALLSERVICE_NOTFOUND)
{
HANDLE hMetaContact = (HANDLE) res;
diff --git a/plugins/Nudge/src/shake.cpp b/plugins/Nudge/src/shake.cpp index f1a4c4a46e..e1b27d24bc 100644 --- a/plugins/Nudge/src/shake.cpp +++ b/plugins/Nudge/src/shake.cpp @@ -35,7 +35,7 @@ DWORD WINAPI ShakeClistWindow(LPVOID Param) INT_PTR ShakeClist( WPARAM wParam, LPARAM lParam )
{
DWORD tid;
- HWND hWnd = (HWND) CallService( MS_CLUI_GETHWND, 0, 0 );
+ HWND hWnd = (HWND) CallService(MS_CLUI_GETHWND, 0, 0 );
CreateThread(NULL,0,ShakeClistWindow,(LPVOID) hWnd,0,&tid);
return 0;
@@ -59,7 +59,7 @@ INT_PTR ShakeChat( WPARAM wParam, LPARAM lParam ) mwid.uFlags = MSG_WINDOW_UFLAG_MSG_BOTH;
- CallService( MS_MSG_GETWINDOWDATA, (WPARAM)&mwid, (LPARAM)&mwd );
+ CallService(MS_MSG_GETWINDOWDATA, (WPARAM)&mwid, (LPARAM)&mwd );
//CallService(MS_MSG_GETWINDOWCLASS,(WPARAM)srmmName,(LPARAM)100 );
HWND parent;
@@ -82,7 +82,7 @@ int TriggerShakeClist( WPARAM wParam, LPARAM lParam ) if (!flags&ACT_PERFORM)
return 0;
- hWnd = (HWND) CallService( MS_CLUI_GETHWND, 0, 0 );
+ hWnd = (HWND) CallService(MS_CLUI_GETHWND, 0, 0 );
CreateThread(NULL,0,ShakeClistWindow,(LPVOID) hWnd,0,&tid);
return 0;
@@ -120,7 +120,7 @@ int TriggerShakeChat( WPARAM wParam, LPARAM lParam ) mwid.hContact = Nudge_GethContact((HANDLE) hContact);
mwid.uFlags = MSG_WINDOW_UFLAG_MSG_BOTH;
- CallService( MS_MSG_GETWINDOWDATA, (WPARAM)&mwid, (LPARAM)&mwd );
+ CallService(MS_MSG_GETWINDOWDATA, (WPARAM)&mwid, (LPARAM)&mwd );
CallService(MS_MSG_GETWINDOWCLASS,(WPARAM)srmmName,(LPARAM)100 );
if ( !strnicmp( srmmName,"tabSRMM ", 7 ))
diff --git a/plugins/PasteIt/src/PasteIt.cpp b/plugins/PasteIt/src/PasteIt.cpp index d8466a2033..219c01f4b1 100644 --- a/plugins/PasteIt/src/PasteIt.cpp +++ b/plugins/PasteIt/src/PasteIt.cpp @@ -467,7 +467,7 @@ extern "C" int __declspec(dllexport) Load(void) nlu.flags = NUF_TCHAR | NUF_OUTGOING | NUF_HTTPCONNS;
nlu.szSettingsModule = MODULE;
nlu.ptszDescriptiveName = TranslateT("Paste It HTTP connections");
- g_hNetlibUser = ( HANDLE )CallService( MS_NETLIB_REGISTERUSER, 0, ( LPARAM )&nlu );
+ g_hNetlibUser = ( HANDLE )CallService(MS_NETLIB_REGISTERUSER, 0, ( LPARAM )&nlu );
pasteToWebs[0] = new PasteToWeb1();
pasteToWebs[0]->pageIndex = 0;
diff --git a/plugins/Quotes/src/Forex.cpp b/plugins/Quotes/src/Forex.cpp index 4a93c23d63..32240ea123 100644 --- a/plugins/Quotes/src/Forex.cpp +++ b/plugins/Quotes/src/Forex.cpp @@ -382,7 +382,7 @@ extern "C" PROTOCOLDESCRIPTOR pd = { PROTOCOLDESCRIPTOR_V3_SIZE };
pd.szName = QUOTES_PROTOCOL_NAME;
pd.type = PROTOTYPE_VIRTUAL;
- CallService( MS_PROTO_REGISTERMODULE, 0, ( LPARAM )&pd );
+ CallService(MS_PROTO_REGISTERMODULE, 0, ( LPARAM )&pd );
HANDLE h = CreateProtoServiceFunction(QUOTES_PROTOCOL_NAME, PS_GETNAME, QuoteProtoFunc_GetName);
g_ahServices.push_back(h);
diff --git a/plugins/Scriver/src/chat/main.cpp b/plugins/Scriver/src/chat/main.cpp index 23bc536582..160683beab 100644 --- a/plugins/Scriver/src/chat/main.cpp +++ b/plugins/Scriver/src/chat/main.cpp @@ -68,7 +68,7 @@ int Chat_Unload(void) int Chat_ModulesLoaded(WPARAM wParam,LPARAM lParam)
{
char* mods[3] = { "Chat", "ChatFonts" };
- CallService( "DBEditorpp/RegisterModule", (WPARAM)mods, 2 );
+ CallService("DBEditorpp/RegisterModule", (WPARAM)mods, 2);
RegisterChatFonts();
OptionsInit();
LoadIcons();
diff --git a/plugins/Scriver/src/utils.cpp b/plugins/Scriver/src/utils.cpp index d6602f039f..4e07d78598 100644 --- a/plugins/Scriver/src/utils.cpp +++ b/plugins/Scriver/src/utils.cpp @@ -36,67 +36,6 @@ int safe_wcslen(wchar_t *msg, int maxLen) { return 0;
}
-TCHAR *a2tcp(const char *text, int cp) {
- if ( text != NULL ) {
- int cbLen = MultiByteToWideChar( cp, 0, text, -1, NULL, 0 );
- TCHAR* result = ( TCHAR* )mir_alloc( sizeof(TCHAR)*( cbLen+1 ));
- if ( result == NULL )
- return NULL;
- MultiByteToWideChar(cp, 0, text, -1, result, cbLen);
- return result;
- }
- return NULL;
-}
-
-char* u2a( const wchar_t* src, int codepage ) {
- int cbLen = WideCharToMultiByte( codepage, 0, src, -1, NULL, 0, NULL, NULL );
- char* result = ( char* )mir_alloc( cbLen+1 );
- if ( result == NULL )
- return NULL;
-
- WideCharToMultiByte( codepage, 0, src, -1, result, cbLen, NULL, NULL );
- result[ cbLen ] = 0;
- return result;
-}
-
-wchar_t* a2u( const char* src, int codepage ) {
- int cbLen = MultiByteToWideChar( codepage, 0, src, -1, NULL, 0 );
- wchar_t* result = ( wchar_t* )mir_alloc( sizeof(wchar_t)*(cbLen+1));
- if ( result == NULL )
- return NULL;
- MultiByteToWideChar( codepage, 0, src, -1, result, cbLen );
- result[ cbLen ] = 0;
- return result;
-}
-
-TCHAR *a2t(const char *text) {
- if ( text == NULL )
- return NULL;
- return a2tcp(text, CallService( MS_LANGPACK_GETCODEPAGE, 0, 0 ));
-}
-
-char* t2a( const TCHAR* src ) {
-return u2a( src, CallService( MS_LANGPACK_GETCODEPAGE, 0, 0 ));
-}
-
-char* t2acp( const TCHAR* src, int codepage ) {
- return u2a( src, codepage );
-}
-
-wchar_t *a2w(const char *src, int len) {
- wchar_t *wline;
- int i;
- if (len <0) {
- len = (int)strlen(src);
- }
- wline = (wchar_t*)mir_alloc(2 * (len + 1));
- for (i = 0; i < len; i ++) {
- wline[i] = src[i];
- }
- wline[i] = 0;
- return wline;
-}
-
static int mimFlags = 0;
enum MIMFLAGS {
diff --git a/plugins/StatusPlugins/AdvancedAutoAway/options.cpp b/plugins/StatusPlugins/AdvancedAutoAway/options.cpp index f1286139ec..6dfb8aa72c 100644 --- a/plugins/StatusPlugins/AdvancedAutoAway/options.cpp +++ b/plugins/StatusPlugins/AdvancedAutoAway/options.cpp @@ -189,7 +189,7 @@ static INT_PTR CALLBACK DlgProcAutoAwayRulesOpts(HWND hwndDlg, UINT msg, WPARAM flags = 0;
for(i=0;i<sizeof(statusModeList)/sizeof(statusModeList[0]);i++) {
if ((flags&statusModePf2List[i]) || (statusModePf2List[i] == PF2_OFFLINE) || (bSettingSame)) {
- lvItem.pszText = ( TCHAR* )CallService( MS_CLIST_GETSTATUSMODEDESCRIPTION, statusModeList[i], GSMDF_TCHAR );
+ lvItem.pszText = ( TCHAR* )CallService(MS_CLIST_GETSTATUSMODEDESCRIPTION, statusModeList[i], GSMDF_TCHAR );
lvItem.lParam = ( LPARAM )statusModePf2List[i];
ListView_InsertItem(hList,&lvItem);
ListView_SetCheckState(hList, lvItem.iItem, setting->statusFlags&statusModePf2List[i]?TRUE:FALSE);
@@ -240,7 +240,7 @@ static INT_PTR CALLBACK DlgProcAutoAwayRulesOpts(HWND hwndDlg, UINT msg, WPARAM {
TCHAR setNaStr[256];
mir_sntprintf(setNaStr, SIZEOF(setNaStr), TranslateT("minutes of %s mode"),
- CallService( MS_CLIST_GETSTATUSMODEDESCRIPTION, setting->lv1Status, GSMDF_TCHAR ));
+ CallService(MS_CLIST_GETSTATUSMODEDESCRIPTION, setting->lv1Status, GSMDF_TCHAR ));
SetDlgItemText(hwndDlg,IDC_SETNASTR,setNaStr);
}
break;
diff --git a/plugins/StatusPlugins/commonstatus.cpp b/plugins/StatusPlugins/commonstatus.cpp index 40fe36365d..11b0699bbd 100644 --- a/plugins/StatusPlugins/commonstatus.cpp +++ b/plugins/StatusPlugins/commonstatus.cpp @@ -126,7 +126,7 @@ TCHAR *GetDefaultStatusMessage(PROTOCOLSETTINGEX *ps, int newstatus) }
if ( ServiceExists( MS_AWAYMSG_GETSTATUSMSGT )) {
- TCHAR* tMsg = ( TCHAR* )CallService( MS_AWAYMSG_GETSTATUSMSGT, newstatus, (LPARAM)ps->szName );
+ TCHAR* tMsg = ( TCHAR* )CallService(MS_AWAYMSG_GETSTATUSMSGT, newstatus, (LPARAM)ps->szName );
log_debugA("CommonStatus: Status message retrieved from general awaysys (TCHAR)");
return tMsg;
}
diff --git a/plugins/StopSpamPlus/src/services.cpp b/plugins/StopSpamPlus/src/services.cpp index c6ea59fe31..8b2914beac 100644 --- a/plugins/StopSpamPlus/src/services.cpp +++ b/plugins/StopSpamPlus/src/services.cpp @@ -37,7 +37,7 @@ INT_PTR RemoveTempContacts(WPARAM wParam,LPARAM lParam) // Set a flag so we remember to delete the contact when the protocol goes online the next time
db_set_b( hContact, "CList", "Delete", 1 );
else
- CallService( MS_DB_CONTACT_DELETE, (WPARAM)hContact, 0 );
+ CallService(MS_DB_CONTACT_DELETE, (WPARAM)hContact, 0 );
}
}
}
@@ -54,7 +54,7 @@ INT_PTR RemoveTempContacts(WPARAM wParam,LPARAM lParam) if ( ConfirmDelete )
db_set_b( NULL, "CList", "ConfirmDelete", 0 );
- CallService( MS_CLIST_GROUPDELETE, (WPARAM)hGroup, 0 );
+ CallService(MS_CLIST_GROUPDELETE, (WPARAM)hGroup, 0 );
if ( ConfirmDelete )
db_set_b( NULL, "CList", "ConfirmDelete", ConfirmDelete );
break;
diff --git a/plugins/TabSRMM/src/chat/tools.cpp b/plugins/TabSRMM/src/chat/tools.cpp index 99ec5177f8..5c0c745013 100644 --- a/plugins/TabSRMM/src/chat/tools.cpp +++ b/plugins/TabSRMM/src/chat/tools.cpp @@ -1148,7 +1148,7 @@ TCHAR* a2tf(const TCHAR* str, int flags, DWORD cp) return(mir_utf8decodeW((char *)str));
if (cp == 0)
- cp = PluginConfig.m_LangPackCP; // CallService( MS_LANGPACK_GETCODEPAGE, 0, 0 );
+ cp = PluginConfig.m_LangPackCP;
cbLen = MultiByteToWideChar(cp, 0, (char*)str, -1, 0, 0);
result = (TCHAR*)mir_alloc(sizeof(TCHAR) * (cbLen + 1));
if (result == NULL)
diff --git a/plugins/Variables/src/tokenregister.cpp b/plugins/Variables/src/tokenregister.cpp index 67c89301ae..ad0d25635d 100644 --- a/plugins/Variables/src/tokenregister.cpp +++ b/plugins/Variables/src/tokenregister.cpp @@ -210,7 +210,7 @@ TCHAR *parseFromRegister(ARGUMENTSINFO *ai) if (thisVr->flags & TRF_PARSEFUNC )
callRes = (INT_PTR)thisVr->parseFunction( &cAi );
else if (thisVr->szService != NULL)
- callRes = CallService( thisVr->szService, 0, (LPARAM)&cAi );
+ callRes = CallService(thisVr->szService, 0, (LPARAM)&cAi );
for ( j=0; j < cAi.argc; j++ )
if (cAi.argv[j] != NULL)
@@ -224,7 +224,7 @@ TCHAR *parseFromRegister(ARGUMENTSINFO *ai) if (thisVr->flags & TRF_PARSEFUNC )
callRes = (INT_PTR)thisVr->parseFunctionT( ai );
else if (thisVr->szService != NULL)
- callRes = CallService( thisVr->szService, 0, (LPARAM)ai );
+ callRes = CallService(thisVr->szService, 0, (LPARAM)ai );
if ((TCHAR*)callRes != NULL)
res = mir_tstrdup((TCHAR*)callRes );
@@ -236,7 +236,7 @@ TCHAR *parseFromRegister(ARGUMENTSINFO *ai) if (trCopy.flags & TRF_CLEANUPFUNC )
trCopy.cleanupFunctionT((TCHAR*)callRes );
else if (trCopy.szCleanupService != NULL)
- CallService( trCopy.szCleanupService, 0, (LPARAM)callRes );
+ CallService(trCopy.szCleanupService, 0, (LPARAM)callRes );
}
if (trCopy.flags & TRF_FREEMEM)
if (trCopy.memType == TR_MEM_MIRANDA)
diff --git a/protocols/IRCG/src/clist.cpp b/protocols/IRCG/src/clist.cpp index 9ea40c9512..3c3c0de534 100644 --- a/protocols/IRCG/src/clist.cpp +++ b/protocols/IRCG/src/clist.cpp @@ -78,9 +78,9 @@ BOOL CIrcProto::CList_AddDCCChat(const CMString& name, const CMString& hostmask, cle.ptszTooltip = szNick;
cle.lParam = (LPARAM)pdci;
- if ( CallService( MS_CLIST_GETEVENT, (WPARAM)hContact, 0))
- CallService( MS_CLIST_REMOVEEVENT, (WPARAM)hContact, (LPARAM)"dccchat");
- CallService( MS_CLIST_ADDEVENT,(WPARAM) hContact,(LPARAM) &cle);
+ if ( CallService(MS_CLIST_GETEVENT, (WPARAM)hContact, 0))
+ CallService(MS_CLIST_REMOVEEVENT, (WPARAM)hContact, (LPARAM)"dccchat");
+ CallService(MS_CLIST_ADDEVENT,(WPARAM) hContact,(LPARAM) &cle);
}
return TRUE;
}
@@ -102,9 +102,9 @@ HANDLE CIrcProto::CList_AddContact(CONTACT * user, bool InList, bool SetOnline) }
// here we create a new one since no one is to be found
- hContact = (HANDLE) CallService( MS_DB_CONTACT_ADD, 0, 0);
+ hContact = (HANDLE)CallService(MS_DB_CONTACT_ADD, 0, 0);
if ( hContact ) {
- CallService( MS_PROTO_ADDTOCONTACT, (WPARAM) hContact, (LPARAM)m_szModuleName );
+ CallService(MS_PROTO_ADDTOCONTACT, (WPARAM) hContact, (LPARAM)m_szModuleName );
if ( InList )
db_unset(hContact, "CList", "NotOnList");
diff --git a/protocols/IRCG/src/commandmonitor.cpp b/protocols/IRCG/src/commandmonitor.cpp index 095a327f86..f5d73cfe71 100644 --- a/protocols/IRCG/src/commandmonitor.cpp +++ b/protocols/IRCG/src/commandmonitor.cpp @@ -706,12 +706,12 @@ bool CIrcProto::OnIrc_PRIVMSG(const CIrcMessage* pmsg) struct CONTACT user = { (TCHAR*)pmsg->prefix.sNick.c_str(), (TCHAR*)pmsg->prefix.sUser.c_str(), (TCHAR*)pmsg->prefix.sHost.c_str(), false, false, false};
- if ( CallService( MS_IGNORE_ISIGNORED, NULL, IGNOREEVENT_MESSAGE ))
- if ( !CList_FindContact( &user ))
+ if ( CallService(MS_IGNORE_ISIGNORED, NULL, IGNOREEVENT_MESSAGE))
+ if ( !CList_FindContact(&user))
return true;
if (( m_ignore && IsIgnored( pmsg->prefix.sNick, pmsg->prefix.sUser, pmsg->prefix.sHost, 'q' ))) {
- HANDLE hContact = CList_FindContact( &user );
+ HANDLE hContact = CList_FindContact(&user);
if ( !hContact || ( hContact && db_get_b( hContact,"CList", "Hidden", 0) == 1 ))
return true;
}
@@ -1142,8 +1142,8 @@ bool CIrcProto::IsCTCP(const CIrcMessage* pmsg) }
else {
struct CONTACT user = { (TCHAR*)pmsg->prefix.sNick.c_str(), (TCHAR*)pmsg->prefix.sUser.c_str(), (TCHAR*)pmsg->prefix.sHost.c_str(), false, false, false};
- if ( CallService( MS_IGNORE_ISIGNORED, NULL, IGNOREEVENT_FILE ))
- if ( !CList_FindContact( &user ))
+ if ( CallService(MS_IGNORE_ISIGNORED, NULL, IGNOREEVENT_FILE))
+ if ( !CList_FindContact(&user))
return true;
HANDLE hContact = CList_AddContact( &user, false, true );
@@ -1914,7 +1914,7 @@ bool CIrcProto::OnIrc_ERROR(const CIrcMessage* pmsg) msn.tszInfo = ( TCHAR* )S.c_str();
msn.dwInfoFlags = NIIF_ERROR | NIIF_INTERN_UNICODE;
msn.uTimeout = 15000;
- CallService( MS_CLIST_SYSTRAY_NOTIFY, 0, ( LPARAM )&msn );
+ CallService(MS_CLIST_SYSTRAY_NOTIFY, 0, (LPARAM)&msn);
}
ShowMessage( pmsg );
return true;
diff --git a/protocols/IRCG/src/input.cpp b/protocols/IRCG/src/input.cpp index 2f87cb1409..156932e8b8 100644 --- a/protocols/IRCG/src/input.cpp +++ b/protocols/IRCG/src/input.cpp @@ -668,7 +668,7 @@ BOOL CIrcProto::DoHardcodedCommand( CMString text, TCHAR* window, HANDLE hContac TCHAR* p = ( TCHAR* )temp.c_str();
pp[0] = p;
pp[1] = NULL;
- CallService( MS_FILE_SENDSPECIFICFILES, (WPARAM)hContact, (LPARAM)pp );
+ CallService(MS_FILE_SENDSPECIFICFILES, (WPARAM)hContact, (LPARAM)pp);
} }
}
else {
diff --git a/protocols/IRCG/src/irclib.cpp b/protocols/IRCG/src/irclib.cpp index 0ebc2d4da0..7314d726cf 100644 --- a/protocols/IRCG/src/irclib.cpp +++ b/protocols/IRCG/src/irclib.cpp @@ -194,7 +194,7 @@ bool CIrcProto::Connect(const CIrcSessionInfo& info) ncon.cbSize = sizeof(ncon);
ncon.szHost = info.sServer.c_str();
ncon.wPort = info.iPort;
- con = (HANDLE) CallService( MS_NETLIB_OPENCONNECTION, (WPARAM) hNetlib, (LPARAM) & ncon);
+ con = (HANDLE)CallService(MS_NETLIB_OPENCONNECTION, (WPARAM)hNetlib, (LPARAM)&ncon);
if (con == NULL) {
TCHAR szTemp[300];
mir_sntprintf(szTemp, SIZEOF(szTemp), _T("\0035%s \002%s\002 (%S: %u)."),
@@ -373,7 +373,7 @@ void CIrcProto::DoReceive() nb.pfnNewConnectionV2 = DoIdent;
nb.pExtra = this;
nb.wPort = m_info.iIdentServerPort;
- hBindPort = (HANDLE)CallService( MS_NETLIB_BINDPORT, (WPARAM)hNetlib,(LPARAM) &nb);
+ hBindPort = (HANDLE)CallService(MS_NETLIB_BINDPORT, (WPARAM)hNetlib, (LPARAM)&nb);
if ( !hBindPort || nb.wPort != m_info.iIdentServerPort ) {
DoNetlibLog("Error: unable to bind local port %u", m_info.iIdentServerPort);
KillIdent();
@@ -920,7 +920,7 @@ int CDccSession::SetupConnection() nb.pfnNewConnectionV2 = DoIncomingDcc; // this is the (helper) function to be called once an incoming connection is made. The 'real' function that is called is IncomingConnection()
nb.pExtra = (void *)this;
nb.wPort = 0;
- hBindPort = (HANDLE)CallService( MS_NETLIB_BINDPORT, (WPARAM)m_proto->hNetlibDCC,(LPARAM) &nb);
+ hBindPort = (HANDLE)CallService(MS_NETLIB_BINDPORT, (WPARAM)m_proto->hNetlibDCC, (LPARAM)&nb);
if ( hBindPort == NULL ) {
delete this; // dcc objects destroy themselves when the connection has been closed or failed for some reasson.
@@ -938,10 +938,9 @@ int CDccSession::SetupConnection() ncon.cbSize = sizeof(ncon);
ncon.szHost = ConvertIntegerToIP(di->dwAdr);
ncon.wPort = (WORD) di->iPort;
- con = (HANDLE) CallService( MS_NETLIB_OPENCONNECTION, (WPARAM)m_proto->hNetlibDCC, (LPARAM) & ncon);
+ con = (HANDLE)CallService(MS_NETLIB_OPENCONNECTION, (WPARAM)m_proto->hNetlibDCC, (LPARAM)&ncon);
}
-
// If a remote computer initiates a filetransfer this is used to connect to that computer (the user has chosen to accept but it is possible the file exists/needs to be resumed etc still)
if ( di->iType == DCC_SEND && !di->bSender ) {
@@ -999,7 +998,7 @@ int CDccSession::SetupConnection() nb.pfnNewConnectionV2 = DoIncomingDcc; // this is the (helper) function to be called once an incoming connection is made. The 'real' function that is called is IncomingConnection()
nb.pExtra = (void *)this;
nb.wPort = 0;
- hBindPort = (HANDLE)CallService( MS_NETLIB_BINDPORT, (WPARAM)m_proto->hNetlibDCC,(LPARAM) &nb);
+ hBindPort = (HANDLE)CallService(MS_NETLIB_BINDPORT, (WPARAM)m_proto->hNetlibDCC, (LPARAM)&nb);
if ( hBindPort == NULL ) {
m_proto->DoEvent(GC_EVENT_INFORMATION, 0, m_proto->m_info.sNick.c_str(), LPGENT("DCC ERROR: Unable to bind local port for passive filetransfer"), NULL, NULL, NULL, true, false);
@@ -1036,7 +1035,7 @@ int CDccSession::SetupConnection() ncon.szHost = ConvertIntegerToIP(di->dwAdr);
ncon.wPort = (WORD) di->iPort;
- con = (HANDLE) CallService( MS_NETLIB_OPENCONNECTION, (WPARAM)m_proto->hNetlibDCC, (LPARAM) & ncon);
+ con = (HANDLE)CallService(MS_NETLIB_OPENCONNECTION, (WPARAM)m_proto->hNetlibDCC, (LPARAM)&ncon);
}
// if for some reason the plugin has failed to connect to the remote computer the object is destroyed.
@@ -1136,7 +1135,7 @@ void CDccSession::DoSendFile() tLastActivity = time(0);
// create a packet receiver to handle receiving ack's from the remote computer.
- HANDLE hPackrcver = (HANDLE)CallService( MS_NETLIB_CREATEPACKETRECVER, (WPARAM)con, (LPARAM)sizeof(DWORD));
+ HANDLE hPackrcver = (HANDLE)CallService(MS_NETLIB_CREATEPACKETRECVER, (WPARAM)con, sizeof(DWORD));
NETLIBPACKETRECVER npr;
npr.cbSize = sizeof(NETLIBPACKETRECVER);
npr.dwTimeout = 60*1000;
@@ -1166,7 +1165,7 @@ void CDccSession::DoSendFile() DWORD dwPacket = NULL;
do {
- dwRead = CallService( MS_NETLIB_GETMOREPACKETS, (WPARAM)hPackrcver, (LPARAM)&npr);
+ dwRead = CallService(MS_NETLIB_GETMOREPACKETS, (WPARAM)hPackrcver, (LPARAM)&npr);
npr.bytesUsed = sizeof(DWORD);
if ( dwRead <= 0)
@@ -1187,7 +1186,7 @@ void CDccSession::DoSendFile() DWORD dwPacket = 0;
do {
- dwRead = CallService( MS_NETLIB_GETMOREPACKETS, (WPARAM)hPackrcver, (LPARAM)&npr);
+ dwRead = CallService(MS_NETLIB_GETMOREPACKETS, (WPARAM)hPackrcver, (LPARAM)&npr);
npr.bytesUsed = sizeof(DWORD);
if ( dwRead <= 0)
break; // connection closed, or a timeout occurred.
diff --git a/protocols/IRCG/src/ircproto.cpp b/protocols/IRCG/src/ircproto.cpp index fb1c5eba4e..8c9981234e 100644 --- a/protocols/IRCG/src/ircproto.cpp +++ b/protocols/IRCG/src/ircproto.cpp @@ -75,7 +75,7 @@ CIrcProto::CIrcProto(const char* szModuleName, const TCHAR* tszUserName) : char text[ MAX_PATH ];
mir_snprintf( text, sizeof( text ), "%s/Status", m_szModuleName);
- CallService( MS_DB_SETSETTINGRESIDENT, TRUE, ( LPARAM )text );
+ CallService(MS_DB_SETSETTINGRESIDENT, TRUE, (LPARAM)text);
CList_SetAllOffline(true);
@@ -206,7 +206,7 @@ int CIrcProto::OnModulesLoaded( WPARAM, LPARAM ) nlu.szSettingsModule = m_szModuleName;
mir_sntprintf( name, SIZEOF(name), TranslateT("%s server connection"), m_tszUserName);
nlu.ptszDescriptiveName = name;
- hNetlib=(HANDLE)CallService( MS_NETLIB_REGISTERUSER, 0, (LPARAM)&nlu);
+ hNetlib = (HANDLE)CallService(MS_NETLIB_REGISTERUSER, 0, (LPARAM)&nlu);
nlu.flags = NUF_OUTGOING|NUF_INCOMING|NUF_HTTPCONNS|NUF_TCHAR;
char szTemp2[256];
@@ -214,15 +214,15 @@ int CIrcProto::OnModulesLoaded( WPARAM, LPARAM ) nlu.szSettingsModule = szTemp2;
mir_sntprintf( name, SIZEOF(name), TranslateT("%s client-to-client connections"), m_tszUserName);
nlu.ptszDescriptiveName = name;
- hNetlibDCC=(HANDLE)CallService( MS_NETLIB_REGISTERUSER, 0, (LPARAM)&nlu);
+ hNetlibDCC = (HANDLE)CallService(MS_NETLIB_REGISTERUSER, 0, (LPARAM)&nlu);
//add as a known module in DB Editor ++
- CallService( "DBEditorpp/RegisterSingleModule",(WPARAM)m_szModuleName,0);
+ CallService("DBEditorpp/RegisterSingleModule", (WPARAM)m_szModuleName, 0);
mir_snprintf(szTemp3, sizeof(szTemp3), "%s DCC", m_szModuleName);
- CallService( "DBEditorpp/RegisterSingleModule",(WPARAM)szTemp3,0);
+ CallService("DBEditorpp/RegisterSingleModule", (WPARAM)szTemp3, 0);
if ( ServiceExists("MBot/GetFcnTable")) {
- CallService( MS_MBOT_REGISTERIRC, 0, (LPARAM)m_szModuleName);
+ CallService(MS_MBOT_REGISTERIRC, 0, (LPARAM)m_szModuleName);
m_bMbotInstalled = TRUE;
}
@@ -262,7 +262,7 @@ int CIrcProto::OnModulesLoaded( WPARAM, LPARAM ) }
else {
if ( IDYES == MessageBox(0,TranslateT("The IRC protocol depends on another plugin called \'Chat\'\n\nDo you want to download it from the Miranda NG web site now?"),TranslateT("Information"),MB_YESNO|MB_ICONINFORMATION ))
- CallService( MS_UTILS_OPENURL, 1, (LPARAM) "http://miranda-ng.org/");
+ CallService(MS_UTILS_OPENURL, 1, (LPARAM)"http://miranda-ng.org/");
}
TCHAR szTemp[MAX_PATH];
@@ -913,7 +913,7 @@ int CIrcProto::SetStatusInternal( int iNewStatus, bool bIsInternal ) msn.tszInfo = TranslateT( "Connection can not be established! You have not completed all necessary fields (Nickname, User ID and m_name)." );
msn.dwInfoFlags = NIIF_ERROR | NIIF_INTERN_UNICODE;
msn.uTimeout = 15000;
- CallService( MS_CLIST_SYSTRAY_NOTIFY, 0,(LPARAM) &msn);
+ CallService(MS_CLIST_SYSTRAY_NOTIFY, 0, (LPARAM)&msn);
return 0;
}
diff --git a/protocols/IRCG/src/main.cpp b/protocols/IRCG/src/main.cpp index f6265a1c2b..88e3fe181b 100644 --- a/protocols/IRCG/src/main.cpp +++ b/protocols/IRCG/src/main.cpp @@ -102,7 +102,7 @@ extern "C" int __declspec(dllexport) Load( ) pd.type = PROTOTYPE_PROTOCOL;
pd.fnInit = ( pfnInitProto )ircProtoInit;
pd.fnUninit = ( pfnUninitProto )ircProtoUninit;
- CallService( MS_PROTO_REGISTERMODULE, 0, (LPARAM)&pd );
+ CallService(MS_PROTO_REGISTERMODULE, 0, (LPARAM)&pd);
return 0;
}
diff --git a/protocols/IRCG/src/options.cpp b/protocols/IRCG/src/options.cpp index 8a0b478598..3d200f4811 100644 --- a/protocols/IRCG/src/options.cpp +++ b/protocols/IRCG/src/options.cpp @@ -170,7 +170,7 @@ void RereadServers() DBCONTACTENUMSETTINGS dbces;
dbces.pfnEnumProc = sttServerEnum;
dbces.szModule = SERVERSMODULE;
- CallService( MS_DB_CONTACT_ENUMSETTINGS, NULL, (LPARAM)&dbces );
+ CallService(MS_DB_CONTACT_ENUMSETTINGS, NULL, (LPARAM)&dbces);
}
/////////////////////////////////////////////////////////////////////////////////////////
@@ -729,7 +729,7 @@ void CConnectPrefsDlg::OnApply() m_port.GetTextA( m_proto->m_portStart, SIZEOF(m_proto->m_portStart));
m_port2.GetTextA( m_proto->m_portEnd, SIZEOF(m_proto->m_portEnd));
m_pass.GetTextA( m_proto->m_password, SIZEOF(m_proto->m_password));
- CallService( MS_DB_CRYPT_ENCODESTRING, SIZEOF(m_proto->m_password), (LPARAM)m_proto->m_password);
+ CallService(MS_DB_CRYPT_ENCODESTRING, SIZEOF(m_proto->m_password), (LPARAM)m_proto->m_password);
}
else m_proto->m_serverName[0] = m_proto->m_portStart[0] = m_proto->m_portEnd[0] = m_proto->m_password[0] = 0;
@@ -800,7 +800,7 @@ void CConnectPrefsDlg::OnApply() if ( m_serverlistModified ) {
m_serverlistModified = false;
- CallService( MS_DB_MODULE_DELETE, 0, (LPARAM)SERVERSMODULE );
+ CallService(MS_DB_MODULE_DELETE, 0, (LPARAM)SERVERSMODULE);
int j = m_serverCombo.GetCount();
if (j != CB_ERR && j != 0) {
@@ -823,7 +823,7 @@ void CConnectPrefsDlg::OnApply() m_proto->WriteSettings( ConnectSettings, SIZEOF( ConnectSettings ));
- CallService( MS_DB_CRYPT_DECODESTRING, SIZEOF(m_proto->m_password), (LPARAM)m_proto->m_password);
+ CallService(MS_DB_CRYPT_DECODESTRING, SIZEOF(m_proto->m_password), (LPARAM)m_proto->m_password);
}
/////////////////////////////////////////////////////////////////////////////////////////
@@ -1098,7 +1098,7 @@ void COtherPrefsDlg::OnInitDialog() void COtherPrefsDlg::OnUrl( CCtrlButton* )
{
- CallService( MS_UTILS_OPENURL,0,(LPARAM) "http://members.chello.se/matrix/index.html" );
+ CallService(MS_UTILS_OPENURL, 0, (LPARAM)"http://members.chello.se/matrix/index.html");
}
void COtherPrefsDlg::OnPerformCombo( CCtrlData* )
@@ -1724,12 +1724,12 @@ void CIrcProto::InitPrefs(void) OtherSettings[0].defStr = _T(STR_QUITMESSAGE);
- ReadSettings( ConnectSettings, SIZEOF( ConnectSettings ));
- ReadSettings( CtcpSettings, SIZEOF( CtcpSettings ));
- ReadSettings( OtherSettings, SIZEOF( OtherSettings ));
- ReadSettings( IgnoreSettings, SIZEOF( IgnoreSettings ));
+ ReadSettings(ConnectSettings, SIZEOF( ConnectSettings ));
+ ReadSettings(CtcpSettings, SIZEOF( CtcpSettings ));
+ ReadSettings(OtherSettings, SIZEOF( OtherSettings ));
+ ReadSettings(IgnoreSettings, SIZEOF( IgnoreSettings ));
- CallService( MS_DB_CRYPT_DECODESTRING, 499, (LPARAM)m_password);
+ CallService(MS_DB_CRYPT_DECODESTRING, 499, (LPARAM)m_password);
int x = getDword( "SizeOfListBottom", -1 );
if ( x != -1 ) {
@@ -1832,7 +1832,7 @@ struct CDlgAccMgrUI : public CProtoDlgBase<CIrcProto> m_port.GetTextA( m_proto->m_portStart, SIZEOF(m_proto->m_portStart));
m_port2.GetTextA( m_proto->m_portEnd, SIZEOF(m_proto->m_portEnd));
m_pass.GetTextA( m_proto->m_password, SIZEOF(m_proto->m_password));
- CallService( MS_DB_CRYPT_ENCODESTRING, SIZEOF(m_proto->m_password), (LPARAM)m_proto->m_password);
+ CallService(MS_DB_CRYPT_ENCODESTRING, SIZEOF(m_proto->m_password), (LPARAM)m_proto->m_password);
m_nick.GetText( m_proto->m_nick, SIZEOF(m_proto->m_nick));
removeSpaces(m_proto->m_nick);
@@ -1843,7 +1843,7 @@ struct CDlgAccMgrUI : public CProtoDlgBase<CIrcProto> removeSpaces(m_proto->m_userID);
m_name.GetText( m_proto->m_name, SIZEOF(m_proto->m_name));
m_proto->WriteSettings( ConnectSettings, SIZEOF( ConnectSettings ));
- CallService( MS_DB_CRYPT_DECODESTRING, SIZEOF(m_proto->m_password), (LPARAM)m_proto->m_password);
+ CallService(MS_DB_CRYPT_DECODESTRING, SIZEOF(m_proto->m_password), (LPARAM)m_proto->m_password);
}
void OnChangeCombo( CCtrlCombo* )
diff --git a/protocols/IRCG/src/scripting.cpp b/protocols/IRCG/src/scripting.cpp index 26c6bc2a55..6c67887397 100644 --- a/protocols/IRCG/src/scripting.cpp +++ b/protocols/IRCG/src/scripting.cpp @@ -136,7 +136,7 @@ INT_PTR __cdecl CIrcProto::Scripting_InsertGuiOut( WPARAM, LPARAM lParam ) BOOL CIrcProto::Scripting_TriggerMSPRawIn( char** pszRaw )
{
- int iVal = CallService( MS_MBOT_IRC_RAW_IN, (WPARAM)m_szModuleName, (LPARAM)pszRaw);
+ int iVal = CallService(MS_MBOT_IRC_RAW_IN, (WPARAM)m_szModuleName, (LPARAM)pszRaw);
if ( iVal == 0 )
return TRUE;
@@ -145,7 +145,7 @@ BOOL CIrcProto::Scripting_TriggerMSPRawIn( char** pszRaw ) BOOL CIrcProto::Scripting_TriggerMSPRawOut(char ** pszRaw)
{
- int iVal = CallService( MS_MBOT_IRC_RAW_OUT, (WPARAM)m_szModuleName, (LPARAM)pszRaw);
+ int iVal = CallService(MS_MBOT_IRC_RAW_OUT, (WPARAM)m_szModuleName, (LPARAM)pszRaw);
if ( iVal == 0 )
return TRUE;
@@ -161,7 +161,7 @@ BOOL CIrcProto::Scripting_TriggerMSPGuiIn(WPARAM * wparam, GCEVENT * gce) if (gce->time == 0)
gce->time = time(0);
- int iVal = CallService( MS_MBOT_IRC_GUI_IN, (WPARAM)&wgi, (LPARAM)gce);
+ int iVal = CallService(MS_MBOT_IRC_GUI_IN, (WPARAM)&wgi, (LPARAM)gce);
if ( iVal == 0 ) {
*wparam = wgi.wParam;
return TRUE;
@@ -172,7 +172,7 @@ BOOL CIrcProto::Scripting_TriggerMSPGuiIn(WPARAM * wparam, GCEVENT * gce) BOOL CIrcProto::Scripting_TriggerMSPGuiOut(GCHOOK* gch)
{
- int iVal = CallService( MS_MBOT_IRC_GUI_OUT, (WPARAM)m_szModuleName, (LPARAM)gch);
+ int iVal = CallService(MS_MBOT_IRC_GUI_OUT, (WPARAM)m_szModuleName, (LPARAM)gch);
if ( iVal == 0 )
return TRUE;
diff --git a/protocols/IRCG/src/services.cpp b/protocols/IRCG/src/services.cpp index f0d49fc8a1..3bf3f885b0 100644 --- a/protocols/IRCG/src/services.cpp +++ b/protocols/IRCG/src/services.cpp @@ -805,7 +805,7 @@ int __cdecl CIrcProto::GCEventHook(WPARAM wParam,LPARAM lParam) acs.handleType = HANDLE_SEARCHRESULT;
acs.szProto = m_szModuleName;
acs.psr = &psr;
- CallService( MS_ADDCONTACT_SHOW, 0, (LPARAM)&acs);
+ CallService(MS_ADDCONTACT_SHOW, 0, (LPARAM)&acs);
}
break;
case 31: //slap
@@ -1232,5 +1232,5 @@ void CIrcProto::DoNetlibLog( const char* fmt, ... ) mir_vsnprintf( str, 32000, fmt, vararg );
va_end( vararg );
- CallService( MS_NETLIB_LOG, (WPARAM)hNetlib, ( LPARAM )str );
+ CallService(MS_NETLIB_LOG, (WPARAM)hNetlib, (LPARAM)str);
}
diff --git a/protocols/IRCG/src/tools.cpp b/protocols/IRCG/src/tools.cpp index a656313cc2..b93d4ea498 100644 --- a/protocols/IRCG/src/tools.cpp +++ b/protocols/IRCG/src/tools.cpp @@ -801,7 +801,7 @@ void CIrcProto::CreateProtoService( const char* serviceName, IrcServiceFunc pFun void CIrcProto::FindLocalIP(HANDLE con) // inspiration from jabber
{
// Determine local IP
- int socket = CallService( MS_NETLIB_GETSOCKET, (WPARAM) con, 0);
+ int socket = CallService(MS_NETLIB_GETSOCKET, (WPARAM) con, 0);
if ( socket != INVALID_SOCKET ) {
struct sockaddr_in saddr;
int len = sizeof(saddr);
diff --git a/protocols/IRCG/src/windows.cpp b/protocols/IRCG/src/windows.cpp index 6d145c999a..12765cd207 100644 --- a/protocols/IRCG/src/windows.cpp +++ b/protocols/IRCG/src/windows.cpp @@ -644,9 +644,9 @@ void CQuickDlg::OnOk( CCtrlButton* ) m_proto->setString("ServerName",m_proto->m_serverName);
m_proto->setString("PortStart",m_proto->m_portStart);
m_proto->setString("PortEnd",m_proto->m_portEnd);
- CallService( MS_DB_CRYPT_ENCODESTRING, 499, (LPARAM)m_proto->m_password);
+ CallService(MS_DB_CRYPT_ENCODESTRING, 499, (LPARAM)m_proto->m_password);
m_proto->setString("Password",m_proto->m_password);
- CallService( MS_DB_CRYPT_DECODESTRING, 499, (LPARAM)m_proto->m_password);
+ CallService(MS_DB_CRYPT_DECODESTRING, 499, (LPARAM)m_proto->m_password);
m_proto->setString("Network",m_proto->m_network);
m_proto->setByte("UseSSL",m_proto->m_iSSL);
}
diff --git a/protocols/Omegle/src/communication.cpp b/protocols/Omegle/src/communication.cpp index 9ea04e1b60..d06a260966 100644 --- a/protocols/Omegle/src/communication.cpp +++ b/protocols/Omegle/src/communication.cpp @@ -57,7 +57,7 @@ http::response Omegle_client::flap( const int request_type, std::string* request break;
}
- NETLIBHTTPREQUEST* pnlhr = ( NETLIBHTTPREQUEST* )CallService( MS_NETLIB_HTTPTRANSACTION, (WPARAM)handle_, (LPARAM)&nlhr );
+ NETLIBHTTPREQUEST* pnlhr = ( NETLIBHTTPREQUEST* )CallService(MS_NETLIB_HTTPTRANSACTION, (WPARAM)handle_, (LPARAM)&nlhr );
http::response resp;
diff --git a/protocols/Tlen/src/jabber_thread.cpp b/protocols/Tlen/src/jabber_thread.cpp index fbf25a6de8..67499c7995 100644 --- a/protocols/Tlen/src/jabber_thread.cpp +++ b/protocols/Tlen/src/jabber_thread.cpp @@ -551,7 +551,7 @@ static void TlenProcessIqGetVersion(TlenProtocol *proto, XmlNode* node) if ( os == NULL ) os = JabberTextEncode( Translate( "Windows" ));
strcpy(mversion, "Miranda NG ");
- CallService( MS_SYSTEM_GETVERSIONTEXT, sizeof( mversion ) - 11, ( LPARAM )mversion + 11 );
+ CallService(MS_SYSTEM_GETVERSIONTEXT, sizeof( mversion ) - 11, ( LPARAM )mversion + 11 );
strcat(mversion, " (Tlen v.");
strcat(mversion, TLEN_VERSION_STRING);
strcat(mversion, ")");
diff --git a/protocols/Tlen/src/tlen_picture.cpp b/protocols/Tlen/src/tlen_picture.cpp index c0233ee233..41a5315480 100644 --- a/protocols/Tlen/src/tlen_picture.cpp +++ b/protocols/Tlen/src/tlen_picture.cpp @@ -261,7 +261,7 @@ BOOL SendPicture(TlenProtocol *proto, HANDLE hContact) { char szFilter[512];
char *szFileName = (char*) mir_alloc(_MAX_PATH);
OPENFILENAMEA ofn = {0};
- CallService( MS_UTILS_GETBITMAPFILTERSTRINGS, ( WPARAM ) sizeof( szFilter ), ( LPARAM )szFilter );
+ CallService(MS_UTILS_GETBITMAPFILTERSTRINGS, ( WPARAM ) sizeof( szFilter ), ( LPARAM )szFilter );
ofn.lStructSize = OPENFILENAME_SIZE_VERSION_400;
ofn.hwndOwner = NULL;
ofn.lpstrFilter = szFilter;
diff --git a/protocols/Twitter/src/connection.cpp b/protocols/Twitter/src/connection.cpp index b0111012e1..031d21fc36 100644 --- a/protocols/Twitter/src/connection.cpp +++ b/protocols/Twitter/src/connection.cpp @@ -190,7 +190,7 @@ bool TwitterProto::NegotiateConnection() }
if (!db_get_ts(NULL,m_szModuleName,TWITTER_KEY_GROUP,&dbv)) {
- CallService( MS_CLIST_GROUPCREATE, 0, (LPARAM)dbv.ptszVal );
+ CallService(MS_CLIST_GROUPCREATE, 0, (LPARAM)dbv.ptszVal );
db_free(&dbv);
}
diff --git a/protocols/Twitter/src/utility.cpp b/protocols/Twitter/src/utility.cpp index e6126062b2..219b8e1ec4 100644 --- a/protocols/Twitter/src/utility.cpp +++ b/protocols/Twitter/src/utility.cpp @@ -121,7 +121,7 @@ http::response mir_twitter::slurp(const std::string &url,http::method meth, req.nlc = httpPOST_;
http::response resp_data;
LOG("**SLURP - just before calling HTTPTRANSACTION");
- NETLIBHTTPREQUEST *resp = reinterpret_cast<NETLIBHTTPREQUEST*>(CallService( MS_NETLIB_HTTPTRANSACTION,
+ NETLIBHTTPREQUEST *resp = reinterpret_cast<NETLIBHTTPREQUEST*>(CallService(MS_NETLIB_HTTPTRANSACTION,
reinterpret_cast<WPARAM>(handle_), reinterpret_cast<LPARAM>(&req)));
LOG("**SLURP - HTTPTRANSACTION complete.");
if(resp)
@@ -170,7 +170,7 @@ bool save_url(HANDLE hNetlib,const std::string &url,const std::tstring &filename req.flags = NLHRF_HTTP11 | NLHRF_REDIRECT;
req.szUrl = const_cast<char*>(url.c_str());
- NETLIBHTTPREQUEST *resp = reinterpret_cast<NETLIBHTTPREQUEST*>(CallService( MS_NETLIB_HTTPTRANSACTION,
+ NETLIBHTTPREQUEST *resp = reinterpret_cast<NETLIBHTTPREQUEST*>(CallService(MS_NETLIB_HTTPTRANSACTION,
reinterpret_cast<WPARAM>(hNetlib), reinterpret_cast<LPARAM>(&req)));
if (resp)
diff --git a/protocols/Xfire/src/Xfire_game.cpp b/protocols/Xfire/src/Xfire_game.cpp index bd8e2b0e2a..78a616ca04 100644 --- a/protocols/Xfire/src/Xfire_game.cpp +++ b/protocols/Xfire/src/Xfire_game.cpp @@ -32,7 +32,7 @@ BOOL Xfire_game::start_game(char*ip,unsigned int port,char*pw) { this->launchparams[3]=='p'&&
this->launchparams[4]==':')
{
- return CallService( MS_UTILS_OPENURL, 1, (LPARAM)this->launchparams );
+ return CallService(MS_UTILS_OPENURL, 1, (LPARAM)this->launchparams );
}
}
@@ -463,7 +463,7 @@ void Xfire_game::remoteMenuitem() {
if(menuhandle!=NULL)
{
- CallService( MS_CLIST_REMOVEMAINMENUITEM, ( WPARAM )menuhandle, 0 );
+ CallService(MS_CLIST_REMOVEMAINMENUITEM, ( WPARAM )menuhandle, 0 );
menuhandle=NULL;
}
}
diff --git a/protocols/Xfire/src/Xfire_gamelist.cpp b/protocols/Xfire/src/Xfire_gamelist.cpp index eca9f00b13..61cca456a5 100644 --- a/protocols/Xfire/src/Xfire_gamelist.cpp +++ b/protocols/Xfire/src/Xfire_gamelist.cpp @@ -259,7 +259,7 @@ void Xfire_gamelist::createDummyMenuItem() //entfernt dummymenueintrag
void Xfire_gamelist::removeDummyMenuItem()
{
- CallService( MS_CLIST_REMOVEMAINMENUITEM, ( WPARAM )dummymenuitem, 0 );
+ CallService(MS_CLIST_REMOVEMAINMENUITEM, ( WPARAM )dummymenuitem, 0 );
}
//säubert die datenbank spiel einträge udn trägt custom spiele vorher nach
diff --git a/protocols/Xfire/src/Xfire_proxy.cpp b/protocols/Xfire/src/Xfire_proxy.cpp index 641c481097..3198f4dc80 100644 --- a/protocols/Xfire/src/Xfire_proxy.cpp +++ b/protocols/Xfire/src/Xfire_proxy.cpp @@ -83,7 +83,7 @@ int AfterSystemModulesLoaded(WPARAM wParam,LPARAM lParam) nb.pfnNewConnectionV2 = XfireclientConnecting;
nb.pExtra = NULL;
nb.wPort = 25999;
- hBindPort = (HANDLE)CallService( MS_NETLIB_BINDPORT, (WPARAM)hNetlib,(LPARAM) &nb);
+ hBindPort = (HANDLE)CallService(MS_NETLIB_BINDPORT, (WPARAM)hNetlib,(LPARAM) &nb);
return 0;
diff --git a/protocols/Xfire/src/main.cpp b/protocols/Xfire/src/main.cpp index 53be6dbcfe..8025b9a7e0 100644 --- a/protocols/Xfire/src/main.cpp +++ b/protocols/Xfire/src/main.cpp @@ -451,7 +451,7 @@ void XFireClient::sendmsg(char*usr,char*cmsg) { case XFIRE_RECVREMOVEBUDDYPACKET:
{
RecvRemoveBuddyPacket *remove = (RecvRemoveBuddyPacket*)content;
- CallService( MS_DB_CONTACT_DELETE, (WPARAM) remove->handle, 1 );
+ CallService(MS_DB_CONTACT_DELETE, (WPARAM) remove->handle, 1 );
break;
}
case XFIRE_BUDDYS_NAMES_ID:
@@ -797,7 +797,7 @@ void __stdcall XFireLog( const char* fmt, ... ) mir_vsnprintf( str, 32000, fmt, vararg );
va_end( vararg );
- CallService( MS_NETLIB_LOG, ( WPARAM )hNetlib, ( LPARAM )str );
+ CallService(MS_NETLIB_LOG, ( WPARAM )hNetlib, ( LPARAM )str );
}
//=====================================================
@@ -1378,7 +1378,7 @@ INT_PTR RecvMessage(WPARAM wParam, LPARAM lParam) char *szProto = GetContactProto(ccs->hContact);
if ( szProto != NULL && !lstrcmpiA( szProto, protocolname ))
- return CallService( MS_PROTO_RECVMSG, wParam, lParam );
+ return CallService(MS_PROTO_RECVMSG, wParam, lParam );
return 1;
}
@@ -1725,9 +1725,9 @@ HANDLE CList_AddContact(XFireContact xfc, bool InList, bool SetOnline,int clan) return 0;
// here we create a new one since no one is to be found
- hContact = (HANDLE) CallService( MS_DB_CONTACT_ADD, 0, 0);
+ hContact = (HANDLE) CallService(MS_DB_CONTACT_ADD, 0, 0);
if ( hContact ) {
- CallService( MS_PROTO_ADDTOCONTACT, (WPARAM) hContact, (LPARAM)protocolname );
+ CallService(MS_PROTO_ADDTOCONTACT, (WPARAM) hContact, (LPARAM)protocolname );
if ( InList )
db_unset(hContact, "CList", "NotOnList");
@@ -1868,7 +1868,7 @@ void CList_MakeAllOffline() //alle gefundenen handles lsöchen
for(uint i=0; i < fhandles.size(); i++)
- CallService( MS_DB_CONTACT_DELETE, (WPARAM) fhandles.at(i), 0);
+ CallService(MS_DB_CONTACT_DELETE, (WPARAM) fhandles.at(i), 0);
}
void SetIcon(HANDLE hcontact,HANDLE hicon,int ctype)
@@ -2132,7 +2132,7 @@ static INT_PTR GotoProfile(WPARAM wParam,LPARAM lParam) strcat_s(temp,64,dbv.pszVal);
db_free(&dbv);
- CallService( MS_UTILS_OPENURL, 1, (LPARAM)temp );
+ CallService(MS_UTILS_OPENURL, 1, (LPARAM)temp );
return 0;
}
@@ -2151,7 +2151,7 @@ static INT_PTR GotoXFireClanSite(WPARAM wParam,LPARAM lParam) { strcat_s(temp,64,dbv.pszVal);
db_free(&dbv);
- CallService( MS_UTILS_OPENURL, 1, (LPARAM)temp );
+ CallService(MS_UTILS_OPENURL, 1, (LPARAM)temp );
return 0;
}
@@ -2168,7 +2168,7 @@ static INT_PTR GotoProfile2(WPARAM wParam,LPARAM lParam) strcat_s(temp,64,dbv.pszVal);
db_free(&dbv);
- CallService( MS_UTILS_OPENURL, 1, (LPARAM)temp );
+ CallService(MS_UTILS_OPENURL, 1, (LPARAM)temp );
//prefrences pakcet senden
//XFirePrefPacket *packet2 = new XFirePrefPacket();
@@ -2190,7 +2190,7 @@ static INT_PTR GotoProfileAct(WPARAM wParam,LPARAM lParam) strcat_s(temp,64,dbv.pszVal);
db_free(&dbv);
- CallService( MS_UTILS_OPENURL, 1, (LPARAM)temp );
+ CallService(MS_UTILS_OPENURL, 1, (LPARAM)temp );
//prefrences pakcet senden
//XFirePrefPacket *packet2 = new XFirePrefPacket();
diff --git a/protocols/Xfire/src/options.cpp b/protocols/Xfire/src/options.cpp index f252282e40..96d1557630 100644 --- a/protocols/Xfire/src/options.cpp +++ b/protocols/Xfire/src/options.cpp @@ -242,11 +242,11 @@ static INT_PTR CALLBACK DlgProcOpts2(HWND hwndDlg, UINT msg, WPARAM wParam, LPAR EnableDlgItem(hwndDlg, IDC_KONFIG_3, TRUE);
}
if ( LOWORD( wParam ) == IDC_URLNEWACC ) {
- CallService( MS_UTILS_OPENURL, 1, ( LPARAM )"http://www.xfire.com/register/" );
+ CallService(MS_UTILS_OPENURL, 1, ( LPARAM )"http://www.xfire.com/register/" );
return TRUE;
}
if ( LOWORD( wParam ) == IDC_LOSTPW ) {
- CallService( MS_UTILS_OPENURL, 1, ( LPARAM )"https://secure.xfire.com/lost_password/" );
+ CallService(MS_UTILS_OPENURL, 1, ( LPARAM )"https://secure.xfire.com/lost_password/" );
return TRUE;
}
diff --git a/protocols/Xfire/src/searching4games.cpp b/protocols/Xfire/src/searching4games.cpp index 509dc28d0a..2a0ab3b8ea 100644 --- a/protocols/Xfire/src/searching4games.cpp +++ b/protocols/Xfire/src/searching4games.cpp @@ -223,7 +223,7 @@ void Scan4Games( LPVOID lparam ) {
searching=FALSE;
//dummymenü punkt entfernen
- //CallService( MS_CLIST_REMOVEMAINMENUITEM, ( WPARAM )dummymenu, 0 );
+ //CallService(MS_CLIST_REMOVEMAINMENUITEM, ( WPARAM )dummymenu, 0 );
//gamelist unblocken
xgamelist.Block(FALSE);
diff --git a/protocols/Yahoo/src/http_gateway.cpp b/protocols/Yahoo/src/http_gateway.cpp index 188d0a36ad..ab096a3261 100644 --- a/protocols/Yahoo/src/http_gateway.cpp +++ b/protocols/Yahoo/src/http_gateway.cpp @@ -25,8 +25,6 @@ int YAHOO_httpGatewayInit(HANDLE hConn, NETLIBOPENCONNECTION *nloc, NETLIBHTTPRE nlhpi.cbSize = sizeof(nlhpi);
nlhpi.szHttpPostUrl = "http://shttp.msg.yahoo.com/notify/";
- //CallService( MS_NETLIB_SETPOLLINGTIMEOUT, (WPARAM) hConn, 15 );
-
return CallService(MS_NETLIB_SETHTTPPROXYINFO, (WPARAM)hConn, (LPARAM)&nlhpi);
}
diff --git a/protocols/Yahoo/src/main.cpp b/protocols/Yahoo/src/main.cpp index 4b5f3e2e22..758c018bce 100644 --- a/protocols/Yahoo/src/main.cpp +++ b/protocols/Yahoo/src/main.cpp @@ -102,14 +102,14 @@ extern "C" int __declspec(dllexport)Load(void) pd.type = PROTOTYPE_PROTOCOL;
pd.fnInit = ( pfnInitProto )yahooProtoInit;
pd.fnUninit = ( pfnUninitProto )yahooProtoUninit;
- CallService( MS_PROTO_REGISTERMODULE, 0, (LPARAM)&pd );
+ CallService(MS_PROTO_REGISTERMODULE, 0, (LPARAM)&pd);
NETLIBUSER nlu = {0};
nlu.cbSize = sizeof(nlu);
nlu.flags = NUF_TCHAR | NUF_OUTGOING | NUF_HTTPCONNS;
nlu.szSettingsModule = "YAHOO/libyahoo2";
nlu.ptszDescriptiveName = TranslateT("YAHOO plugin HTTP connections");
- g_hNetlibUser = ( HANDLE )CallService( MS_NETLIB_REGISTERUSER, 0, (LPARAM)&nlu );
+ g_hNetlibUser = (HANDLE)CallService(MS_NETLIB_REGISTERUSER, 0, (LPARAM)&nlu);
YmsgrLinksInit();
/**
diff --git a/protocols/Yahoo/src/options.cpp b/protocols/Yahoo/src/options.cpp index cc3e96913e..1cc64865da 100644 --- a/protocols/Yahoo/src/options.cpp +++ b/protocols/Yahoo/src/options.cpp @@ -48,7 +48,7 @@ static INT_PTR CALLBACK DlgProcYahooOpts(HWND hwndDlg, UINT msg, WPARAM wParam, if ( !ppro->GetString( YAHOO_PASSWORD, &dbv )) {
//bit of a security hole here, since it's easy to extract a password from an edit box
- CallService( MS_DB_CRYPT_DECODESTRING, strlen( dbv.pszVal )+1, (LPARAM)dbv.pszVal );
+ CallService(MS_DB_CRYPT_DECODESTRING, strlen( dbv.pszVal )+1, (LPARAM)dbv.pszVal);
SetDlgItemTextA( hwndDlg, IDC_PASSWORD, dbv.pszVal );
db_free( &dbv );
}
@@ -66,7 +66,7 @@ static INT_PTR CALLBACK DlgProcYahooOpts(HWND hwndDlg, UINT msg, WPARAM wParam, switch ( LOWORD( wParam )) {
case IDC_NEWYAHOOACCOUNTLINK:
- CallService( MS_UTILS_OPENURL, 1,
+ CallService(MS_UTILS_OPENURL, 1,
ppro->GetByte("YahooJapan", 0) ?
(LPARAM)"http://edit.yahoo.co.jp/config/eval_register" :
(LPARAM)"http://edit.yahoo.com/config/eval_register");
@@ -110,7 +110,7 @@ static INT_PTR CALLBACK DlgProcYahooOpts(HWND hwndDlg, UINT msg, WPARAM wParam, ppro->SetString( YAHOO_LOGINID, str );
GetDlgItemTextA( hwndDlg, IDC_PASSWORD, str, sizeof( str ));
- CallService( MS_DB_CRYPT_ENCODESTRING, sizeof( str ),(LPARAM)str );
+ CallService(MS_DB_CRYPT_ENCODESTRING, sizeof(str), (LPARAM)str);
dbv.pszVal = NULL;
if ( ppro->GetString( YAHOO_PASSWORD, &dbv ) || lstrcmpA( str, dbv.pszVal ))
reconnectRequired = TRUE;
diff --git a/protocols/Yahoo/src/proto.cpp b/protocols/Yahoo/src/proto.cpp index 9971a8a0f6..4ab4dfe26d 100644 --- a/protocols/Yahoo/src/proto.cpp +++ b/protocols/Yahoo/src/proto.cpp @@ -98,7 +98,7 @@ int CYahooProto::OnModulesLoadedEx( WPARAM, LPARAM ) nlu.pfnHttpGatewayUnwrapRecv = YAHOO_httpGatewayUnwrapRecv;
#endif
- m_hNetlibUser = ( HANDLE )CallService( MS_NETLIB_REGISTERUSER, 0, (LPARAM)&nlu );
+ m_hNetlibUser = (HANDLE)CallService(MS_NETLIB_REGISTERUSER, 0, (LPARAM)&nlu);
MenuContactInit();
return 0;
@@ -763,7 +763,7 @@ INT_PTR CALLBACK first_run_dialog(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM case WM_COMMAND:
if ( LOWORD( wParam ) == IDC_NEWYAHOOACCOUNTLINK ) {
- CallService( MS_UTILS_OPENURL,
+ CallService(MS_UTILS_OPENURL,
1,
(( BYTE )IsDlgButtonChecked( hwndDlg, IDC_YAHOO_JAPAN ) == 1) ?
(LPARAM) "http://edit.yahoo.co.jp/config/eval_register" :
diff --git a/protocols/Yahoo/src/services.cpp b/protocols/Yahoo/src/services.cpp index 1e5b7648f5..64756331db 100644 --- a/protocols/Yahoo/src/services.cpp +++ b/protocols/Yahoo/src/services.cpp @@ -239,7 +239,7 @@ void CYahooProto::OpenURL(const char *url, int autoLogin) DebugLog("[YahooOpenURL] url: %s Final URL: %s", url, tUrl);
- CallService( MS_UTILS_OPENURL, TRUE, (LPARAM)tUrl );
+ CallService(MS_UTILS_OPENURL, TRUE, (LPARAM)tUrl);
}
//=======================================================
@@ -367,13 +367,13 @@ INT_PTR __cdecl CYahooProto::GetUnreadEmailCount(WPARAM wParam, LPARAM lParam) void CYahooProto::MenuMainInit( void )
{
char servicefunction[ 100 ];
- lstrcpyA( servicefunction, m_szModuleName );
+ lstrcpyA( servicefunction, m_szModuleName);
char* tDest = servicefunction + lstrlenA( servicefunction );
CLISTMENUITEM mi = { sizeof(mi) };
mi.pszService = servicefunction;
- HGENMENU hRoot = MO_GetProtoRootMenu( m_szModuleName );
+ HGENMENU hRoot = MO_GetProtoRootMenu( m_szModuleName);
if ( hRoot == NULL) {
mi.position = 500015000;
mi.hParentMenu = HGENMENU_ROOT;
@@ -468,7 +468,7 @@ void CYahooProto::MenuMainInit( void ) void CYahooProto::MenuContactInit( void )
{
char servicefunction[ 100 ];
- lstrcpyA( servicefunction, m_szModuleName );
+ lstrcpyA( servicefunction, m_szModuleName);
char* tDest = servicefunction + lstrlenA( servicefunction );
CLISTMENUITEM mi = { sizeof(mi) };
@@ -489,9 +489,9 @@ void CYahooProto::MenuContactInit( void ) void CYahooProto::MenuUninit( void )
{
if ( mainMenuRoot )
- CallService( MS_CLIST_REMOVEMAINMENUITEM, (WPARAM)mainMenuRoot, 0);
+ CallService(MS_CLIST_REMOVEMAINMENUITEM, (WPARAM)mainMenuRoot, 0);
- CallService( MS_CLIST_REMOVECONTACTMENUITEM, (WPARAM)hShowProfileMenuItem, 0);
+ CallService(MS_CLIST_REMOVECONTACTMENUITEM, (WPARAM)hShowProfileMenuItem, 0);
}
int __cdecl CYahooProto::OnPrebuildContactMenu(WPARAM wParam, LPARAM)
@@ -518,7 +518,7 @@ void CYahooProto::LoadYahooServices( void ) YHookEvent( ME_OPT_INITIALISE, &CYahooProto::OnOptionsInit );
//----| Create nudge event |----------------------------------------------------------
- mir_snprintf( path, SIZEOF(path), "%s/Nudge", m_szModuleName);
+ mir_snprintf(path, SIZEOF(path), "%s/Nudge", m_szModuleName);
hYahooNudge = CreateHookableEvent( path );
//----| Service creation |------------------------------------------------------------
@@ -536,27 +536,27 @@ void CYahooProto::LoadYahooServices( void ) //----| Set resident variables |------------------------------------------------------
- mir_snprintf( path, SIZEOF(path), "%s/Status", m_szModuleName );
- CallService( MS_DB_SETSETTINGRESIDENT, TRUE, (LPARAM)path );
+ mir_snprintf(path, SIZEOF(path), "%s/Status", m_szModuleName);
+ CallService(MS_DB_SETSETTINGRESIDENT, TRUE, (LPARAM)path);
- mir_snprintf( path, SIZEOF(path), "%s/YStatus", m_szModuleName );
- CallService( MS_DB_SETSETTINGRESIDENT, TRUE, (LPARAM)path );
+ mir_snprintf(path, SIZEOF(path), "%s/YStatus", m_szModuleName);
+ CallService(MS_DB_SETSETTINGRESIDENT, TRUE, (LPARAM)path);
- mir_snprintf( path, SIZEOF(path), "%s/YAway", m_szModuleName );
- CallService( MS_DB_SETSETTINGRESIDENT, TRUE, (LPARAM)path );
+ mir_snprintf(path, SIZEOF(path), "%s/YAway", m_szModuleName);
+ CallService(MS_DB_SETSETTINGRESIDENT, TRUE, (LPARAM)path);
- mir_snprintf( path, SIZEOF(path), "%s/Mobile", m_szModuleName );
- CallService( MS_DB_SETSETTINGRESIDENT, TRUE, (LPARAM)path );
+ mir_snprintf(path, SIZEOF(path), "%s/Mobile", m_szModuleName);
+ CallService(MS_DB_SETSETTINGRESIDENT, TRUE, (LPARAM)path);
- mir_snprintf( path, SIZEOF(path), "%s/YGMsg", m_szModuleName );
- CallService( MS_DB_SETSETTINGRESIDENT, TRUE, (LPARAM)path );
+ mir_snprintf(path, SIZEOF(path), "%s/YGMsg", m_szModuleName);
+ CallService(MS_DB_SETSETTINGRESIDENT, TRUE, (LPARAM)path);
- mir_snprintf( path, SIZEOF(path), "%s/IdleTS", m_szModuleName );
- CallService( MS_DB_SETSETTINGRESIDENT, TRUE, (LPARAM)path );
+ mir_snprintf(path, SIZEOF(path), "%s/IdleTS", m_szModuleName);
+ CallService(MS_DB_SETSETTINGRESIDENT, TRUE, (LPARAM)path);
- mir_snprintf( path, SIZEOF(path), "%s/PictLastCheck", m_szModuleName );
- CallService( MS_DB_SETSETTINGRESIDENT, TRUE, (LPARAM)path );
+ mir_snprintf(path, SIZEOF(path), "%s/PictLastCheck", m_szModuleName);
+ CallService(MS_DB_SETSETTINGRESIDENT, TRUE, (LPARAM)path);
- mir_snprintf( path, SIZEOF(path), "%s/PictLoading", m_szModuleName );
- CallService( MS_DB_SETSETTINGRESIDENT, TRUE, (LPARAM)path );
+ mir_snprintf(path, SIZEOF(path), "%s/PictLoading", m_szModuleName);
+ CallService(MS_DB_SETSETTINGRESIDENT, TRUE, (LPARAM)path);
}
diff --git a/protocols/Yahoo/src/yahoo.cpp b/protocols/Yahoo/src/yahoo.cpp index 2f474c8c37..1b6fafa066 100644 --- a/protocols/Yahoo/src/yahoo.cpp +++ b/protocols/Yahoo/src/yahoo.cpp @@ -319,7 +319,7 @@ HANDLE CYahooProto::add_buddy( const char *yahoo_id, const char *yahoo_name, int //not already there: add
LOG(("[add_buddy] Adding buddy id: %s (Nick: %s), flags: %lu", yid, yahoo_name, flags));
- hContact = (HANDLE)CallService( MS_DB_CONTACT_ADD, 0, 0);
+ hContact = (HANDLE)CallService(MS_DB_CONTACT_ADD, 0, 0);
CallService(MS_PROTO_ADDTOCONTACT, (WPARAM)hContact,(LPARAM)m_szModuleName);
SetString( hContact, YAHOO_LOGINID, yid );
Set_Protocol( hContact, protocol );
@@ -727,7 +727,7 @@ void CYahooProto::ext_rejected(const char *who, const char *msg) * Make sure the contact is temporary so we could delete it w/o extra traffic
*/
db_set_b( hContact, "CList", "NotOnList", 1 );
- CallService( MS_DB_CONTACT_DELETE, (WPARAM) hContact, 0);
+ CallService(MS_DB_CONTACT_DELETE, (WPARAM) hContact, 0);
}
else LOG(("[ext_rejected] Buddy not on our buddy list"));
@@ -759,7 +759,7 @@ void CYahooProto::ext_buddy_added(char *myid, char *who, char *group, int status ShowPopup( TranslateT("Invalid Contact"), TranslateT("The id you tried to add is invalid."), NULL);
/* Make it TEMP first, we don't want to send any extra packets for FALSE ids */
db_set_b( hContact, "CList", "NotOnList", 1 );
- CallService( MS_DB_CONTACT_DELETE, (WPARAM) hContact, 0);
+ CallService(MS_DB_CONTACT_DELETE, (WPARAM) hContact, 0);
}
break;
@@ -769,7 +769,7 @@ void CYahooProto::ext_buddy_added(char *myid, char *who, char *group, int status ShowPopup( TranslateT("Invalid Contact"), TranslateT("Unknown Error??."), NULL);
/* Make it TEMP first, we don't want to send any extra packets for FALSE ids */
db_set_b( hContact, "CList", "NotOnList", 1 );
- CallService( MS_DB_CONTACT_DELETE, (WPARAM) hContact, 0);
+ CallService(MS_DB_CONTACT_DELETE, (WPARAM) hContact, 0);
}
break;
@@ -1371,7 +1371,7 @@ static void connect_complete(void *data, int source, yahoo_input_condition condi //tSelect.dwTimeout = T->mGatewayTimeout * 1000;
tSelect.dwTimeout = 1;
tSelect.hReadConns[ 0 ] = ( HANDLE )source;
- error = CallService( MS_NETLIB_SELECT, 0, (LPARAM)&tSelect );
+ error = CallService(MS_NETLIB_SELECT, 0, (LPARAM)&tSelect );
if (error) {
//close(source);
diff --git a/src/core/stdchat/src/clist.cpp b/src/core/stdchat/src/clist.cpp index fb147bf717..a4fac02a9d 100644 --- a/src/core/stdchat/src/clist.cpp +++ b/src/core/stdchat/src/clist.cpp @@ -72,7 +72,7 @@ END_GROUPLOOP: if (( hContact = (HANDLE) CallService(MS_DB_CONTACT_ADD, 0, 0)) == NULL )
return NULL;
- CallService( MS_PROTO_ADDTOCONTACT, (WPARAM) hContact, (LPARAM) pszModule );
+ CallService(MS_PROTO_ADDTOCONTACT, (WPARAM) hContact, (LPARAM) pszModule );
if ( pszGroup && lstrlen( pszGroup ) > 0 )
db_set_ts(hContact, "CList", "Group", pszGroup );
else
diff --git a/src/core/stdchat/src/services.cpp b/src/core/stdchat/src/services.cpp index 620d3f254e..fa9a5f8a01 100644 --- a/src/core/stdchat/src/services.cpp +++ b/src/core/stdchat/src/services.cpp @@ -754,7 +754,7 @@ static int ModuleLoad(WPARAM wParam, LPARAM lParam) static int ModulesLoaded(WPARAM wParam,LPARAM lParam)
{
char* mods[3] = { "Chat", "ChatFonts" };
- CallService( "DBEditorpp/RegisterModule", (WPARAM)mods, 2 );
+ CallService("DBEditorpp/RegisterModule", (WPARAM)mods, 2 );
RegisterFonts();
AddIcons();
diff --git a/src/core/stdclist/src/clistopts.cpp b/src/core/stdclist/src/clistopts.cpp index 194d6e20e3..8191f2c7b6 100644 --- a/src/core/stdclist/src/clistopts.cpp +++ b/src/core/stdclist/src/clistopts.cpp @@ -123,7 +123,7 @@ static INT_PTR CALLBACK DlgProcGenOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LP PROTOACCOUNT **accs;
DBVARIANT dbv = { DBVT_DELETED };
db_get(NULL, "CList", "PrimaryStatus", &dbv);
- CallService( MS_PROTO_ENUMACCOUNTS, (WPARAM)&count, (LPARAM)&accs);
+ CallService(MS_PROTO_ENUMACCOUNTS, (WPARAM)&count, (LPARAM)&accs);
item = SendDlgItemMessage(hwndDlg, IDC_PRIMARYSTATUS, CB_ADDSTRING, 0, (LPARAM) TranslateT("Global"));
SendDlgItemMessage(hwndDlg, IDC_PRIMARYSTATUS, CB_SETITEMDATA, item, (LPARAM) 0);
for (i = 0; i < count; i++) {
diff --git a/src/core/stdmsg/src/msglog.cpp b/src/core/stdmsg/src/msglog.cpp index 51a7baad09..f8250adf8f 100644 --- a/src/core/stdmsg/src/msglog.cpp +++ b/src/core/stdmsg/src/msglog.cpp @@ -245,7 +245,7 @@ static char *SetToStyle(int style) int DbEventIsForMsgWindow(DBEVENTINFO *dbei)
{
- DBEVENTTYPEDESCR* et = ( DBEVENTTYPEDESCR* )CallService( MS_DB_EVENT_GETTYPE, ( WPARAM )dbei->szModule, ( LPARAM )dbei->eventType );
+ DBEVENTTYPEDESCR* et = ( DBEVENTTYPEDESCR* )CallService(MS_DB_EVENT_GETTYPE, ( WPARAM )dbei->szModule, ( LPARAM )dbei->eventType );
return et && ( et->flags & DETF_MSGWINDOW );
}
|