code cleaning

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

5 files changed, 122 insertions, 120 deletions

diff --git a/plugins/Clist_modern/src/hdr/modern_clui.h b/plugins/Clist_modern/src/hdr/modern_clui.h
index 0b8cc4f9e1..492889fadd 100644
--- a/plugins/Clist_modern/src/hdr/modern_clui.h
+++ b/plugins/Clist_modern/src/hdr/modern_clui.h
@@ -111,7 +111,7 @@ public:
 			HANDLE_MESSAGE( WM_DRAWITEM,				OnDrawItem );

 			HANDLE_MESSAGE( WM_DESTROY,					OnDestroy );

 		default:

-			return This->DefCluiWndProc( msg, wParam, lParam );

+			return This->DefCluiWndProc(msg, wParam, lParam);

 		}

 		return FALSE;

 	}

@@ -130,55 +130,55 @@ private:
 	HRESULT CreateCLCWindow(const HWND parent);

 	HRESULT CreateUIFrames();

 

-	LRESULT DefCluiWndProc( UINT msg, WPARAM wParam, LPARAM lParam )

+	LRESULT DefCluiWndProc(UINT msg, WPARAM wParam, LPARAM lParam)

 	{

-		return corecli.pfnContactListWndProc( m_hWnd, msg, wParam, lParam );

+		return corecli.pfnContactListWndProc( m_hWnd, msg, wParam, lParam);

 	}

 

 	// MessageMap

-	LRESULT PreProcessWndProc( UINT msg, WPARAM wParam, LPARAM lParam, BOOL& bHandled );

-	LRESULT OnSizingMoving( UINT msg, WPARAM wParam, LPARAM lParam );

-	LRESULT OnThemeChanged( UINT msg, WPARAM wParam, LPARAM lParam );

-	LRESULT OnDwmCompositionChanged( UINT msg, WPARAM wParam, LPARAM lParam );

-	LRESULT OnSyncCall( UINT msg, WPARAM wParam, LPARAM lParam );

-	LRESULT OnUpdate( UINT msg, WPARAM wParam, LPARAM lParam );

-	LRESULT OnInitMenu( UINT msg, WPARAM wParam, LPARAM lParam );

-	LRESULT OnNcPaint( UINT msg, WPARAM wParam, LPARAM lParam );

-	LRESULT OnEraseBkgnd( UINT msg, WPARAM wParam, LPARAM lParam );

-	LRESULT OnNcCreate( UINT msg, WPARAM wParam, LPARAM lParam );

-	LRESULT OnPaint( UINT msg, WPARAM wParam, LPARAM lParam );

-	LRESULT OnCreate( UINT msg, WPARAM wParam, LPARAM lParam );

-	LRESULT OnSetAllExtraIcons( UINT msg, WPARAM wParam, LPARAM lParam );

-	LRESULT OnCreateClc( UINT msg, WPARAM wParam, LPARAM lParam );

-	LRESULT OnLButtonDown( UINT msg, WPARAM wParam, LPARAM lParam );

-	LRESULT OnParentNotify( UINT msg, WPARAM wParam, LPARAM lParam );

-	LRESULT OnSetFocus( UINT msg, WPARAM wParam, LPARAM lParam );

-	LRESULT OnTimer( UINT msg, WPARAM wParam, LPARAM lParam );

-	LRESULT OnStatusBarUpdateTimer( UINT msg, WPARAM wParam, LPARAM lParam );

-	LRESULT OnAutoAlphaTimer( UINT msg, WPARAM wParam, LPARAM lParam );

-	LRESULT OnSmoothAlphaTransitionTimer( UINT msg, WPARAM wParam, LPARAM lParam );

-	LRESULT OnDelayedSizingTimer( UINT msg, WPARAM wParam, LPARAM lParam );

-	LRESULT OnBringOutTimer( UINT msg, WPARAM wParam, LPARAM lParam );

-	LRESULT OnBringInTimer( UINT msg, WPARAM wParam, LPARAM lParam );

-	LRESULT OnUpdateBringTimer( UINT msg, WPARAM wParam, LPARAM lParam );

-	LRESULT OnActivate( UINT msg, WPARAM wParam, LPARAM lParam );

-	LRESULT OnSetCursor( UINT msg, WPARAM wParam, LPARAM lParam );

-	LRESULT OnMouseActivate( UINT msg, WPARAM wParam, LPARAM lParam );

-	LRESULT OnNcLButtonDown( UINT msg, WPARAM wParam, LPARAM lParam );

-	LRESULT OnNcLButtonDblClk( UINT msg, WPARAM wParam, LPARAM lParam );

-	LRESULT OnNcHitTest( UINT msg, WPARAM wParam, LPARAM lParam );

-	LRESULT OnShowWindow( UINT msg, WPARAM wParam, LPARAM lParam );

-	LRESULT OnSysCommand( UINT msg, WPARAM wParam, LPARAM lParam );

-	LRESULT OnKeyDown( UINT msg, WPARAM wParam, LPARAM lParam );

-	LRESULT OnGetMinMaxInfo( UINT msg, WPARAM wParam, LPARAM lParam );

-	LRESULT OnMoving( UINT msg, WPARAM wParam, LPARAM lParam );

-	LRESULT OnNotify( UINT msg, WPARAM wParam, LPARAM lParam );

-	LRESULT OnListSizeChangeNotify( NMCLISTCONTROL * pnmc );

-	LRESULT OnClickNotify( NMCLISTCONTROL * pnmc );

-	LRESULT OnContextMenu( UINT msg, WPARAM wParam, LPARAM lParam );

-	LRESULT OnMeasureItem( UINT msg, WPARAM wParam, LPARAM lParam );

-	LRESULT OnDrawItem( UINT msg, WPARAM wParam, LPARAM lParam );

-	LRESULT OnDestroy( UINT msg, WPARAM wParam, LPARAM lParam );

+	LRESULT PreProcessWndProc(UINT msg, WPARAM wParam, LPARAM lParam, BOOL& bHandled );

+	LRESULT OnSizingMoving(UINT msg, WPARAM wParam, LPARAM lParam);

+	LRESULT OnThemeChanged(UINT msg, WPARAM wParam, LPARAM lParam);

+	LRESULT OnDwmCompositionChanged(UINT msg, WPARAM wParam, LPARAM lParam);

+	LRESULT OnSyncCall(UINT msg, WPARAM wParam, LPARAM lParam);

+	LRESULT OnUpdate(UINT msg, WPARAM wParam, LPARAM lParam);

+	LRESULT OnInitMenu(UINT msg, WPARAM wParam, LPARAM lParam);

+	LRESULT OnNcPaint(UINT msg, WPARAM wParam, LPARAM lParam);

+	LRESULT OnEraseBkgnd(UINT msg, WPARAM wParam, LPARAM lParam);

+	LRESULT OnNcCreate(UINT msg, WPARAM wParam, LPARAM lParam);

+	LRESULT OnPaint(UINT msg, WPARAM wParam, LPARAM lParam);

+	LRESULT OnCreate(UINT msg, WPARAM wParam, LPARAM lParam);

+	LRESULT OnSetAllExtraIcons(UINT msg, WPARAM wParam, LPARAM lParam);

+	LRESULT OnCreateClc(UINT msg, WPARAM wParam, LPARAM lParam);

+	LRESULT OnLButtonDown(UINT msg, WPARAM wParam, LPARAM lParam);

+	LRESULT OnParentNotify(UINT msg, WPARAM wParam, LPARAM lParam);

+	LRESULT OnSetFocus(UINT msg, WPARAM wParam, LPARAM lParam);

+	LRESULT OnTimer(UINT msg, WPARAM wParam, LPARAM lParam);

+	LRESULT OnStatusBarUpdateTimer(UINT msg, WPARAM wParam, LPARAM lParam);

+	LRESULT OnAutoAlphaTimer(UINT msg, WPARAM wParam, LPARAM lParam);

+	LRESULT OnSmoothAlphaTransitionTimer(UINT msg, WPARAM wParam, LPARAM lParam);

+	LRESULT OnDelayedSizingTimer(UINT msg, WPARAM wParam, LPARAM lParam);

+	LRESULT OnBringOutTimer(UINT msg, WPARAM wParam, LPARAM lParam);

+	LRESULT OnBringInTimer(UINT msg, WPARAM wParam, LPARAM lParam);

+	LRESULT OnUpdateBringTimer(UINT msg, WPARAM wParam, LPARAM lParam);

+	LRESULT OnActivate(UINT msg, WPARAM wParam, LPARAM lParam);

+	LRESULT OnSetCursor(UINT msg, WPARAM wParam, LPARAM lParam);

+	LRESULT OnMouseActivate(UINT msg, WPARAM wParam, LPARAM lParam);

+	LRESULT OnNcLButtonDown(UINT msg, WPARAM wParam, LPARAM lParam);

+	LRESULT OnNcLButtonDblClk(UINT msg, WPARAM wParam, LPARAM lParam);

+	LRESULT OnNcHitTest(UINT msg, WPARAM wParam, LPARAM lParam);

+	LRESULT OnShowWindow(UINT msg, WPARAM wParam, LPARAM lParam);

+	LRESULT OnSysCommand(UINT msg, WPARAM wParam, LPARAM lParam);

+	LRESULT OnKeyDown(UINT msg, WPARAM wParam, LPARAM lParam);

+	LRESULT OnGetMinMaxInfo(UINT msg, WPARAM wParam, LPARAM lParam);

+	LRESULT OnMoving(UINT msg, WPARAM wParam, LPARAM lParam);

+	LRESULT OnNotify(UINT msg, WPARAM wParam, LPARAM lParam);

+	LRESULT OnListSizeChangeNotify(NMCLISTCONTROL *pnmc);

+	LRESULT OnClickNotify(NMCLISTCONTROL *pnmc);

+	LRESULT OnContextMenu(UINT msg, WPARAM wParam, LPARAM lParam);

+	LRESULT OnMeasureItem(UINT msg, WPARAM wParam, LPARAM lParam);

+	LRESULT OnDrawItem(UINT msg, WPARAM wParam, LPARAM lParam);

+	LRESULT OnDestroy(UINT msg, WPARAM wParam, LPARAM lParam);

 

 protected:

 	HMODULE m_hDwmapiDll;

diff --git a/plugins/Clist_modern/src/hdr/modern_commonheaders.h b/plugins/Clist_modern/src/hdr/modern_commonheaders.h
index 480a928935..eb5b67dd8d 100644
--- a/plugins/Clist_modern/src/hdr/modern_commonheaders.h
+++ b/plugins/Clist_modern/src/hdr/modern_commonheaders.h
@@ -331,6 +331,8 @@ BOOL rowParse(ROWCELL* &cell, ROWCELL* parent, char *tbuf, int &hbuf, int &seque
 void rowSizeWithReposition(ROWCELL* &root, int width);

 #endif

 

+#define UNPACK_POINT(X) { (short)LOWORD(X), (short)HIWORD(X) }

+

 //////////////////////////////////////////////////////////////////////////

 // Specific class for quick implementation of map<string, *> list

 // with some more fast searching it is

diff --git a/plugins/Clist_modern/src/hdr/modern_skinengine.h b/plugins/Clist_modern/src/hdr/modern_skinengine.h
index 5d7f23f2e5..87fd769f40 100644
--- a/plugins/Clist_modern/src/hdr/modern_skinengine.h
+++ b/plugins/Clist_modern/src/hdr/modern_skinengine.h
@@ -94,12 +94,12 @@ public:
 

 	typedef HRESULT (*ParserCallback_t)( const char * szSection, const char * szKey, const char * szValue, IniParser * This );

 

-	IniParser( TCHAR * szFileName, BYTE flags = FLAG_WITH_SETTINGS );

-	IniParser(  HINSTANCE hInst, const char *  resourceName, const char * resourceType, BYTE flags = FLAG_ONLY_OBJECTS );

+	IniParser(TCHAR * szFileName, BYTE flags = FLAG_WITH_SETTINGS);

+	IniParser(HINSTANCE hInst, const char *resourceName, const char *resourceType, BYTE flags = FLAG_ONLY_OBJECTS);

 	~IniParser();

 

 	bool CheckOK() { return _isValid; }

-	HRESULT Parse( ParserCallback_t pLineCallBackProc, LPARAM lParam );

+	HRESULT Parse(ParserCallback_t pLineCallBackProc, LPARAM lParam);

 

 	static HRESULT WriteStrToDb( const char * szSection, const char * szKey, const char * szValue, IniParser * This);

 	static int GetSkinFolder( IN const TCHAR * szFileName, OUT TCHAR * pszFolderName );

diff --git a/plugins/Clist_modern/src/hdr/modern_static_cluiframes_service.h b/plugins/Clist_modern/src/hdr/modern_static_cluiframes_service.h
index 46a2dfaed9..7bfd947ced 100644
--- a/plugins/Clist_modern/src/hdr/modern_static_cluiframes_service.h
+++ b/plugins/Clist_modern/src/hdr/modern_static_cluiframes_service.h
@@ -4,28 +4,28 @@
 // TO BE INCLUDED ONLY TO modern_cluiframes.cpp

 //////////////////////////////////////////////////////////////////////////

 

-static int _us_DoSetFramePaintProc( WPARAM wParam,LPARAM lParam );

-static int _us_DoAddFrame( WPARAM wParam,LPARAM lParam );

-static int _us_DoRemoveFrame( WPARAM wParam,LPARAM lParam );

-static int _us_DoSetFrameOptions( WPARAM wParam,LPARAM lParam );

-static INT_PTR _us_DoGetFrameOptions( WPARAM wParam,LPARAM lParam );

-static int _us_DoUpdateFrame( WPARAM wParam,LPARAM lParam );

-static int _us_DoShowHideFrameTitle( WPARAM wParam,LPARAM lParam );

-static int _us_DoShowTitles( WPARAM wParam,LPARAM lParam );

-static int _us_DoHideTitles( WPARAM wParam,LPARAM lParam );

-static int _us_DoShowHideFrame( WPARAM wParam,LPARAM lParam );

-static int _us_DoShowAllFrames( WPARAM wParam,LPARAM lParam );

-static int _us_DoLockFrame( WPARAM wParam,LPARAM lParam );

-static int _us_DoCollapseFrame( WPARAM wParam,LPARAM lParam );

-static int _us_DoSetFrameBorder( WPARAM wParam,LPARAM lParam );

-static int _us_DoSetFrameAlign( WPARAM wParam,LPARAM lParam );

-static int _us_DoMoveFrame( WPARAM wParam,LPARAM lParam );

-static int _us_DoMoveFrameUp( WPARAM wParam,LPARAM lParam );

-static int _us_DoMoveFrameDown( WPARAM wParam,LPARAM lParam );

-static int _us_DoAlignFrameTop( WPARAM wParam,LPARAM lParam );

-static int _us_DoAlignFrameClient( WPARAM wParam,LPARAM lParam );

-static int _us_DoAlignFrameBottom( WPARAM wParam,LPARAM lParam );

-static int _us_DoSetFrameFloat( WPARAM wParam,LPARAM lParam );

+static int _us_DoSetFramePaintProc(WPARAM wParam,LPARAM lParam);

+static int _us_DoAddFrame(WPARAM wParam,LPARAM lParam);

+static int _us_DoRemoveFrame(WPARAM wParam,LPARAM lParam);

+static int _us_DoSetFrameOptions(WPARAM wParam,LPARAM lParam);

+static INT_PTR _us_DoGetFrameOptions(WPARAM wParam,LPARAM lParam);

+static int _us_DoUpdateFrame(WPARAM wParam,LPARAM lParam);

+static int _us_DoShowHideFrameTitle(WPARAM wParam,LPARAM lParam);

+static int _us_DoShowTitles(WPARAM wParam,LPARAM lParam);

+static int _us_DoHideTitles(WPARAM wParam,LPARAM lParam);

+static int _us_DoShowHideFrame(WPARAM wParam,LPARAM lParam);

+static int _us_DoShowAllFrames(WPARAM wParam,LPARAM lParam);

+static int _us_DoLockFrame(WPARAM wParam,LPARAM lParam);

+static int _us_DoCollapseFrame(WPARAM wParam,LPARAM lParam);

+static int _us_DoSetFrameBorder(WPARAM wParam,LPARAM lParam);

+static int _us_DoSetFrameAlign(WPARAM wParam,LPARAM lParam);

+static int _us_DoMoveFrame(WPARAM wParam,LPARAM lParam);

+static int _us_DoMoveFrameUp(WPARAM wParam,LPARAM lParam);

+static int _us_DoMoveFrameDown(WPARAM wParam,LPARAM lParam);

+static int _us_DoAlignFrameTop(WPARAM wParam,LPARAM lParam);

+static int _us_DoAlignFrameClient(WPARAM wParam,LPARAM lParam);

+static int _us_DoAlignFrameBottom(WPARAM wParam,LPARAM lParam);

+static int _us_DoSetFrameFloat(WPARAM wParam,LPARAM lParam);

 

 enum { 

 	CFM_FIRST_MGS= WM_USER + 0x2FF,

@@ -92,71 +92,71 @@ BOOL CALLBACK ProcessCLUIFrameInternalMsg(HWND hwnd, UINT msg, WPARAM wParam, LP
 	return TRUE;

 }

 

-static INT_PTR CLUIFrames_SetFramePaintProc( WPARAM wParam,LPARAM lParam )

-{  return ( pcli->hwndContactList ) ? SendMessage( pcli->hwndContactList, CFM_SETFRAMEPAINTPROC, wParam,lParam ) : 0; }

+static INT_PTR CLUIFrames_SetFramePaintProc(WPARAM wParam,LPARAM lParam)

+{  return ( pcli->hwndContactList ) ? SendMessage( pcli->hwndContactList, CFM_SETFRAMEPAINTPROC, wParam,lParam) : 0; }

 

-static INT_PTR CLUIFrames_AddFrame( WPARAM wParam,LPARAM lParam )

-{  return ( pcli->hwndContactList ) ? SendMessage( pcli->hwndContactList, CFM_ADDFRAME, wParam, lParam ) : 0; }

+static INT_PTR CLUIFrames_AddFrame(WPARAM wParam,LPARAM lParam)

+{  return ( pcli->hwndContactList ) ? SendMessage( pcli->hwndContactList, CFM_ADDFRAME, wParam, lParam) : 0; }

 

-static INT_PTR CLUIFrames_RemoveFrame( WPARAM wParam,LPARAM lParam )

-{  return ( pcli->hwndContactList ) ? SendMessage( pcli->hwndContactList, CFM_REMOVEFRAME, wParam, lParam ) : 0; }

+static INT_PTR CLUIFrames_RemoveFrame(WPARAM wParam,LPARAM lParam)

+{  return ( pcli->hwndContactList ) ? SendMessage( pcli->hwndContactList, CFM_REMOVEFRAME, wParam, lParam) : 0; }

 

-static INT_PTR CLUIFrames_SetFrameOptions( WPARAM wParam,LPARAM lParam )

-{  return ( pcli->hwndContactList ) ? SendMessage( pcli->hwndContactList, CFM_SETFRAMEOPTIONS, wParam, lParam ) : 0; }

+static INT_PTR CLUIFrames_SetFrameOptions(WPARAM wParam,LPARAM lParam)

+{  return ( pcli->hwndContactList ) ? SendMessage( pcli->hwndContactList, CFM_SETFRAMEOPTIONS, wParam, lParam) : 0; }

 

-static INT_PTR CLUIFrames_GetFrameOptions( WPARAM wParam,LPARAM lParam )

-{  return ( pcli->hwndContactList ) ? SendMessage( pcli->hwndContactList, CFM_GETFRAMEOPTIONS, wParam, lParam ) : 0; }

+static INT_PTR CLUIFrames_GetFrameOptions(WPARAM wParam,LPARAM lParam)

+{  return ( pcli->hwndContactList ) ? SendMessage( pcli->hwndContactList, CFM_GETFRAMEOPTIONS, wParam, lParam) : 0; }

 

-static INT_PTR CLUIFrames_UpdateFrame( WPARAM wParam,LPARAM lParam )

-{  return ( pcli->hwndContactList ) ? SendMessage( pcli->hwndContactList, CFM_UPDATEFRAME, wParam, lParam ) : 0; }

+static INT_PTR CLUIFrames_UpdateFrame(WPARAM wParam,LPARAM lParam)

+{  return ( pcli->hwndContactList ) ? SendMessage( pcli->hwndContactList, CFM_UPDATEFRAME, wParam, lParam) : 0; }

 

-static INT_PTR CLUIFrames_ShowHideFrameTitle( WPARAM wParam,LPARAM lParam )

-{  return ( pcli->hwndContactList ) ? SendMessage( pcli->hwndContactList, CFM_SHOWHIDEFRAMETITLE, wParam, lParam ) : 0; }

+static INT_PTR CLUIFrames_ShowHideFrameTitle(WPARAM wParam,LPARAM lParam)

+{  return ( pcli->hwndContactList ) ? SendMessage( pcli->hwndContactList, CFM_SHOWHIDEFRAMETITLE, wParam, lParam) : 0; }

 

-static INT_PTR CLUIFrames_ShowTitles( WPARAM wParam,LPARAM lParam )

-{  return ( pcli->hwndContactList ) ? SendMessage( pcli->hwndContactList, CFM_SHOWTITLES, wParam, lParam ) : 0; }

+static INT_PTR CLUIFrames_ShowTitles(WPARAM wParam,LPARAM lParam)

+{  return ( pcli->hwndContactList ) ? SendMessage( pcli->hwndContactList, CFM_SHOWTITLES, wParam, lParam) : 0; }

 

-static INT_PTR CLUIFrames_HideTitles( WPARAM wParam,LPARAM lParam )

-{  return ( pcli->hwndContactList ) ? SendMessage( pcli->hwndContactList, CFM_HIDETITLES, wParam, lParam ) : 0; }

+static INT_PTR CLUIFrames_HideTitles(WPARAM wParam,LPARAM lParam)

+{  return ( pcli->hwndContactList ) ? SendMessage( pcli->hwndContactList, CFM_HIDETITLES, wParam, lParam) : 0; }

 

-static INT_PTR CLUIFrames_ShowHideFrame( WPARAM wParam,LPARAM lParam )

-{  return ( pcli->hwndContactList ) ? SendMessage( pcli->hwndContactList, CFM_SHOWHIDEFRAME, wParam, lParam ) : 0; }

+static INT_PTR CLUIFrames_ShowHideFrame(WPARAM wParam,LPARAM lParam)

+{  return ( pcli->hwndContactList ) ? SendMessage( pcli->hwndContactList, CFM_SHOWHIDEFRAME, wParam, lParam) : 0; }

 

-static INT_PTR CLUIFrames_ShowAllFrames( WPARAM wParam,LPARAM lParam )

-{  return ( pcli->hwndContactList ) ? SendMessage( pcli->hwndContactList, CFM_SHOWALL, wParam, lParam ) : 0; }

+static INT_PTR CLUIFrames_ShowAllFrames(WPARAM wParam,LPARAM lParam)

+{  return ( pcli->hwndContactList ) ? SendMessage( pcli->hwndContactList, CFM_SHOWALL, wParam, lParam) : 0; }

 

-static INT_PTR CLUIFrames_LockFrame( WPARAM wParam,LPARAM lParam )

-{  return ( pcli->hwndContactList ) ? SendMessage( pcli->hwndContactList, CFM_LOCKFRAME, wParam, lParam ) : 0; }

+static INT_PTR CLUIFrames_LockFrame(WPARAM wParam,LPARAM lParam)

+{  return ( pcli->hwndContactList ) ? SendMessage( pcli->hwndContactList, CFM_LOCKFRAME, wParam, lParam) : 0; }

 

-static INT_PTR CLUIFrames_CollapseFrame( WPARAM wParam,LPARAM lParam )

-{  return ( pcli->hwndContactList ) ? SendMessage( pcli->hwndContactList, CFM_COLLAPSEFRAME, wParam, lParam ) : 0; }

+static INT_PTR CLUIFrames_CollapseFrame(WPARAM wParam,LPARAM lParam)

+{  return ( pcli->hwndContactList ) ? SendMessage( pcli->hwndContactList, CFM_COLLAPSEFRAME, wParam, lParam) : 0; }

 

-static INT_PTR CLUIFrames_SetFrameBorder( WPARAM wParam,LPARAM lParam )

-{  return ( pcli->hwndContactList ) ? SendMessage( pcli->hwndContactList, CFM_SETFRAMEBORDER, wParam, lParam ) : 0; }

+static INT_PTR CLUIFrames_SetFrameBorder(WPARAM wParam,LPARAM lParam)

+{  return ( pcli->hwndContactList ) ? SendMessage( pcli->hwndContactList, CFM_SETFRAMEBORDER, wParam, lParam) : 0; }

 

-static INT_PTR CLUIFrames_SetFrameAlign( WPARAM wParam,LPARAM lParam )

-{  return ( pcli->hwndContactList ) ? SendMessage( pcli->hwndContactList, CFM_SETFRAMEALIGN, wParam, lParam ) : 0; }

+static INT_PTR CLUIFrames_SetFrameAlign(WPARAM wParam,LPARAM lParam)

+{  return ( pcli->hwndContactList ) ? SendMessage( pcli->hwndContactList, CFM_SETFRAMEALIGN, wParam, lParam) : 0; }

 

-static INT_PTR CLUIFrames_MoveFrame( WPARAM wParam,LPARAM lParam )

-{  return ( pcli->hwndContactList ) ? SendMessage( pcli->hwndContactList, CFM_MOVEFRAME, wParam, lParam ) : 0; }

+static INT_PTR CLUIFrames_MoveFrame(WPARAM wParam,LPARAM lParam)

+{  return ( pcli->hwndContactList ) ? SendMessage( pcli->hwndContactList, CFM_MOVEFRAME, wParam, lParam) : 0; }

 

-static INT_PTR CLUIFrames_MoveFrameUp( WPARAM wParam,LPARAM lParam )

-{  return ( pcli->hwndContactList ) ? SendMessage( pcli->hwndContactList, CFM_MOVEFRAMEUP, wParam, lParam ) : 0; }

+static INT_PTR CLUIFrames_MoveFrameUp(WPARAM wParam,LPARAM lParam)

+{  return ( pcli->hwndContactList ) ? SendMessage( pcli->hwndContactList, CFM_MOVEFRAMEUP, wParam, lParam) : 0; }

 

-static INT_PTR CLUIFrames_MoveFrameDown( WPARAM wParam,LPARAM lParam )

-{  return ( pcli->hwndContactList ) ? SendMessage( pcli->hwndContactList, CFM_MOVEFRAMEDOWN, wParam, lParam ) : 0; }

+static INT_PTR CLUIFrames_MoveFrameDown(WPARAM wParam,LPARAM lParam)

+{  return ( pcli->hwndContactList ) ? SendMessage( pcli->hwndContactList, CFM_MOVEFRAMEDOWN, wParam, lParam) : 0; }

 

-static INT_PTR CLUIFrames_AlignFrameTop( WPARAM wParam,LPARAM lParam )

-{  return ( pcli->hwndContactList ) ? SendMessage( pcli->hwndContactList, CFM_ALIGNFRAMETOP, wParam, lParam ) : 0; }

+static INT_PTR CLUIFrames_AlignFrameTop(WPARAM wParam,LPARAM lParam)

+{  return ( pcli->hwndContactList ) ? SendMessage( pcli->hwndContactList, CFM_ALIGNFRAMETOP, wParam, lParam) : 0; }

 

-static INT_PTR CLUIFrames_AlignFrameClient( WPARAM wParam,LPARAM lParam )

-{  return ( pcli->hwndContactList ) ? SendMessage( pcli->hwndContactList, CFM_ALIGNFRAMEBOTTOM, wParam, lParam ) : 0; }

+static INT_PTR CLUIFrames_AlignFrameClient(WPARAM wParam,LPARAM lParam)

+{  return ( pcli->hwndContactList ) ? SendMessage( pcli->hwndContactList, CFM_ALIGNFRAMEBOTTOM, wParam, lParam) : 0; }

 

-static INT_PTR CLUIFrames_AlignFrameBottom( WPARAM wParam,LPARAM lParam )

-{  return ( pcli->hwndContactList ) ? SendMessage( pcli->hwndContactList, CFM_ALIGNFRAMECLIENT, wParam, lParam ) : 0; }

+static INT_PTR CLUIFrames_AlignFrameBottom(WPARAM wParam,LPARAM lParam)

+{  return ( pcli->hwndContactList ) ? SendMessage( pcli->hwndContactList, CFM_ALIGNFRAMECLIENT, wParam, lParam) : 0; }

 

-static INT_PTR CLUIFrames_SetFrameFloat( WPARAM wParam,LPARAM lParam )

-{  return ( pcli->hwndContactList ) ? SendMessage( pcli->hwndContactList, CFM_SETFRAMEFLOAT, wParam, lParam ) : 0; }

+static INT_PTR CLUIFrames_SetFrameFloat(WPARAM wParam,LPARAM lParam)

+{  return ( pcli->hwndContactList ) ? SendMessage( pcli->hwndContactList, CFM_SETFRAMEFLOAT, wParam, lParam) : 0; }

 

 static void CreateCluiFramesServices()

 {

diff --git a/plugins/Clist_modern/src/hdr/modern_sync.h b/plugins/Clist_modern/src/hdr/modern_sync.h
index 334d4696a7..4f7010ae08 100644
--- a/plugins/Clist_modern/src/hdr/modern_sync.h
+++ b/plugins/Clist_modern/src/hdr/modern_sync.h
@@ -11,11 +11,11 @@ int SyncCallProxy( PSYNCCALLBACKPROC pfnProc, WPARAM wParam, LPARAM lParam, CRIT
 HRESULT SyncCallWinProcProxy( PSYNCCALLBACKPROC pfnProc, WPARAM wParam, LPARAM lParam, int& nReturn );

 HRESULT SyncCallAPCProxy( PSYNCCALLBACKPROC pfnProc, WPARAM wParam, LPARAM lParam, int& hReturn );

 

-LRESULT SyncOnWndProcCall( WPARAM wParam );

+LRESULT SyncOnWndProcCall(WPARAM wParam );

 

 // Experimental sync caller

 

-int DoCall( PSYNCCALLBACKPROC pfnProc, WPARAM wParam, LPARAM lParam );

+int DoCall( PSYNCCALLBACKPROC pfnProc, WPARAM wParam, LPARAM lParam);

 

 // Have to be here due to MS Visual C++ does not support 'export' keyword

 

@@ -28,7 +28,7 @@ template<class RET, class A, class B, class C> class PARAMS3
 

 public:

 	PARAMS3( proc_t __proc, A __a, B __b, C __c ): _proc( __proc), _a (__a), _b(__b), _c(__c){};

-	static int DoSyncCall( WPARAM wParam, LPARAM lParam )

+	static int DoSyncCall(WPARAM wParam, LPARAM lParam)

 	{

 		PARAMS3 * params = (PARAMS3 *) lParam;	

 		params->_ret = params->_proc( params->_a, params->_b, params->_c );

@@ -54,7 +54,7 @@ template<class RET, class A, class B> class PARAMS2
 

 public:

 	PARAMS2( proc_t __proc, A __a, B __b ): _proc( __proc), _a (__a), _b(__b){};

-	static int DoSyncCall( WPARAM wParam, LPARAM lParam )

+	static int DoSyncCall(WPARAM wParam, LPARAM lParam)

 	{

 		PARAMS2 * params = (PARAMS2 *) lParam;	

 		params->_ret = params->_proc( params->_a, params->_b );

@@ -79,7 +79,7 @@ template<class RET, class A> class PARAMS1
 

 public:

 	PARAMS1( proc_t __proc, A __a): _proc( __proc), _a (__a){};

-	static int DoSyncCall( WPARAM, LPARAM lParam )

+	static int DoSyncCall(WPARAM, LPARAM lParam)

 	{

 		PARAMS1 * params = (PARAMS1 *) lParam;	

 		params->_ret = params->_proc( params->_a );