minor code cleaning

git-svn-id: http://svn.miranda-ng.org/main/trunk@5083 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

28 files changed, 89 insertions, 150 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)&param ))

+		if ( CallService(MS_PNG2DIB, 0, (LPARAM)&param ))

 			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)