clist_modern: code cleaning

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

11 files changed, 146 insertions, 152 deletions

diff --git a/plugins/Clist_modern/src/hdr/modern_cache_funcs.h b/plugins/Clist_modern/src/hdr/modern_cache_funcs.h
index af86a029d4..a1b75b96af 100644
--- a/plugins/Clist_modern/src/hdr/modern_cache_funcs.h
+++ b/plugins/Clist_modern/src/hdr/modern_cache_funcs.h
@@ -31,13 +31,13 @@ Created by Pescuma
 #include "modern_clc.h"

 #include "modern_commonprototypes.h"

 

-void Cache_GetText(struct ClcData *dat, ClcContact *contact, BOOL forceRenew);

-void Cache_GetFirstLineText(struct ClcData *dat, ClcContact *contact);

-void Cache_GetSecondLineText(struct SHORTDATA *dat, PDNCE pdnce);

-void Cache_GetThirdLineText(struct SHORTDATA *dat, PDNCE pdnce);

-void Cache_GetAvatar(struct ClcData *dat, ClcContact *contact);

-void Cache_GetTimezone(struct ClcData *dat, HANDLE hContact);

-int Cache_GetLineText(PDNCE pdnce, int type, LPTSTR text, int text_size, TCHAR *variable_text, BOOL xstatus_has_priority,

+void Cache_GetText(ClcData *dat, ClcContact *contact, BOOL forceRenew);

+void Cache_GetFirstLineText(ClcData *dat, ClcContact *contact);

+void Cache_GetSecondLineText(struct SHORTDATA *dat, ClcCacheEntry *pdnce);

+void Cache_GetThirdLineText(struct SHORTDATA *dat, ClcCacheEntry *pdnce);

+void Cache_GetAvatar(ClcData *dat, ClcContact *contact);

+void Cache_GetTimezone(ClcData *dat, HANDLE hContact);

+int Cache_GetLineText(ClcCacheEntry *pdnce, int type, LPTSTR text, int text_size, TCHAR *variable_text, BOOL xstatus_has_priority,

 					  BOOL show_status_if_no_away, BOOL show_listening_if_no_away, BOOL use_name_and_message_for_xstatus,

 					  BOOL pdnce_time_show_only_if_different);

 

diff --git a/plugins/Clist_modern/src/hdr/modern_clc.h b/plugins/Clist_modern/src/hdr/modern_clc.h
index 6c64663105..be3956db26 100644
--- a/plugins/Clist_modern/src/hdr/modern_clc.h
+++ b/plugins/Clist_modern/src/hdr/modern_clc.h
@@ -383,7 +383,6 @@ struct SHORTDATA
 	BOOL    third_line_use_name_and_message_for_xstatus;

 };

 

-

 typedef struct tagOVERLAYICONINFO

 {

 	char *name;

@@ -397,36 +396,36 @@ void    ClcOptionsChanged(void);
 

 //clcidents.c

 int     cliGetRowsPriorTo(ClcGroup *group,ClcGroup *subgroup,int contactIndex);

-int     FindItem(HWND hwnd,struct ClcData *dat,HANDLE hItem,ClcContact **contact,ClcGroup **subgroup,int *isVisible, BOOL isIgnoreSubcontacts );

-int     cliGetRowByIndex(struct ClcData *dat,int testindex,ClcContact **contact,ClcGroup **subgroup);

+int     FindItem(HWND hwnd,ClcData *dat,HANDLE hItem,ClcContact **contact,ClcGroup **subgroup,int *isVisible, BOOL isIgnoreSubcontacts );

+int     cliGetRowByIndex(ClcData *dat,int testindex,ClcContact **contact,ClcGroup **subgroup);

 HANDLE  ContactToHItem(ClcContact *contact);

 HANDLE  ContactToItemHandle(ClcContact *contact,DWORD *nmFlags);

 void    ClearRowByIndexCache();

 

 //clcitems.c

-ClcGroup *cli_AddGroup(HWND hwnd,struct ClcData *dat,const TCHAR *szName,DWORD flags,int groupId,int calcTotalMembers);

+ClcGroup *cli_AddGroup(HWND hwnd,ClcData *dat,const TCHAR *szName,DWORD flags,int groupId,int calcTotalMembers);

 void    cli_FreeGroup(ClcGroup *group);

 int     cli_AddInfoItemToGroup(ClcGroup *group,int flags,const TCHAR *pszText);

-void    cliRebuildEntireList(HWND hwnd,struct ClcData *dat);

+void    cliRebuildEntireList(HWND hwnd,ClcData *dat);

 void    cli_DeleteItemFromTree(HWND hwnd,HANDLE hItem);

-void    cli_AddContactToTree(HWND hwnd,struct ClcData *dat,HANDLE hContact,int updateTotalCount,int checkHideOffline);

-void    cli_SortCLC(HWND hwnd,struct ClcData *dat,int useInsertionSort);

+void    cli_AddContactToTree(HWND hwnd,ClcData *dat,HANDLE hContact,int updateTotalCount,int checkHideOffline);

+void    cli_SortCLC(HWND hwnd,ClcData *dat,int useInsertionSort);

 int     GetNewSelection(ClcGroup *group,int selection, int direction);

 

 //clcmsgs.c

-LRESULT cli_ProcessExternalMessages(HWND hwnd,struct ClcData *dat,UINT msg,WPARAM wParam,LPARAM lParam);

+LRESULT cli_ProcessExternalMessages(HWND hwnd,ClcData *dat,UINT msg,WPARAM wParam,LPARAM lParam);

 

 //clcutils.c

-void    cliRecalcScrollBar(HWND hwnd,struct ClcData *dat);

-void    cliBeginRenameSelection(HWND hwnd,struct ClcData *dat);

-int     cliHitTest(HWND hwnd,struct ClcData *dat,int testx,int testy,ClcContact **contact,ClcGroup **group,DWORD *flags);

-void    cliScrollTo(HWND hwnd,struct ClcData *dat,int desty,int noSmooth);

-int     GetDropTargetInformation(HWND hwnd,struct ClcData *dat,POINT pt);

-void    LoadCLCOptions(HWND hwnd,struct ClcData *dat);

+void    cliRecalcScrollBar(HWND hwnd,ClcData *dat);

+void    cliBeginRenameSelection(HWND hwnd,ClcData *dat);

+int     cliHitTest(HWND hwnd,ClcData *dat,int testx,int testy,ClcContact **contact,ClcGroup **group,DWORD *flags);

+void    cliScrollTo(HWND hwnd,ClcData *dat,int desty,int noSmooth);

+int     GetDropTargetInformation(HWND hwnd,ClcData *dat,POINT pt);

+void    LoadCLCOptions(HWND hwnd,ClcData *dat);

 

 

 //clcpaint.c

-void    CLCPaint_cliPaintClc(HWND hwnd,struct ClcData *dat,HDC hdc,RECT *rcPaint);

+void    CLCPaint_cliPaintClc(HWND hwnd,ClcData *dat,HDC hdc,RECT *rcPaint);

 

 //clcopts.c

 int     ClcOptInit(WPARAM wParam,LPARAM lParam);

diff --git a/plugins/Clist_modern/src/hdr/modern_clcpaint.h b/plugins/Clist_modern/src/hdr/modern_clcpaint.h
index 6e1a5ceea4..97c299fdbe 100644
--- a/plugins/Clist_modern/src/hdr/modern_clcpaint.h
+++ b/plugins/Clist_modern/src/hdr/modern_clcpaint.h
@@ -9,15 +9,15 @@ public:
 	CLCPaint();

 	~CLCPaint() {};

 

-	 CLINTERFACE void   cliPaintClc( HWND hwnd, struct ClcData *dat, HDC hdc, RECT *rcPaint );

-	 CLINTERFACE tPaintCallbackProc PaintCallbackProc( HWND hWnd, HDC hDC, RECT * rcPaint, HRGN rgn, DWORD dFlags, void * CallBackData );

+	 CLINTERFACE void   cliPaintClc(HWND hwnd, ClcData *dat, HDC hdc, RECT *rcPaint);

+	 CLINTERFACE tPaintCallbackProc PaintCallbackProc(HWND hWnd, HDC hDC, RECT *rcPaint, HRGN rgn, DWORD dFlags, void * CallBackData);

 

-	 BOOL   IsForegroundWindow( HWND hWnd );

-	 HFONT  ChangeToFont( HDC hdc, struct ClcData *dat, int id, int *fontHeight );

-	 int    GetBasicFontID( ClcContact * contact );

-	 void   GetTextSize( SIZE *text_size, HDC hdcMem, RECT free_row_rc, TCHAR *szText, SortedList *plText, UINT uTextFormat, int smiley_height );

-	 void   AddParam( MODERNMASK * mpModernMask, DWORD dwParamHash, const char* szValue, DWORD dwValueHash ); 

-	 BOOL   CheckMiniMode( struct ClcData *dat, BOOL selected, BOOL hot );

+	 BOOL   IsForegroundWindow(HWND hWnd);

+	 HFONT  ChangeToFont(HDC hdc, ClcData *dat, int id, int *fontHeight);

+	 int    GetBasicFontID(ClcContact *contact);

+	 void   GetTextSize(SIZE *text_size, HDC hdcMem, RECT free_row_rc, TCHAR *szText, SortedList *plText, UINT uTextFormat, int smiley_height);

+	 void   AddParam(MODERNMASK *mpModernMask, DWORD dwParamHash, const char* szValue, DWORD dwValueHash); 

+	 BOOL   CheckMiniMode(ClcData *dat, BOOL selected, BOOL hot);

 

 private:

 	static const int HORIZONTAL_SPACE;

@@ -95,42 +95,40 @@ private:
 	static const char * HASHTEXT[hi_LastItem];

 	static DWORD HASH[hi_LastItem];

 

-

-

-	 void _FillQuickHash();

-	 void _SetHotTrackColour( HDC hdc, struct ClcData *dat );

-	 int  _GetStatusOnlineness( int status );

-	 int  _GetGeneralisedStatus();

-	 int  _GetRealStatus( ClcContact * pContact, int nStatus );

-	 RECT _GetRectangle( struct ClcData *dat, RECT *row_rc, RECT *free_row_rc, int *left_pos, int *right_pos, BOOL left, int real_width, int width, int height, int horizontal_space );

-	 void _DrawTextSmiley( HDC hdcMem, RECT * free_rc, SIZE * text_size, TCHAR *szText, int start, int len, SortedList *plText, UINT uTextFormat, BOOL ResizeSizeSmiley );

-	 void _AddParameter( MODERNMASK * mpModernMask, MASKPARAM * lpParam );

-	 void _AddParamShort( MODERNMASK * mpModernMask, DWORD dwParamIndex, DWORD dwValueIndex );

-	 void _FillParam( MASKPARAM * lpParam, DWORD dwParamHash, const char* szValue, DWORD dwValueHash );

-	 MODERNMASK * _GetCLCContactRowBackModernMask( ClcGroup * group, ClcContact * Drawing, int indent, int index, BOOL selected, BOOL hottrack, struct ClcData * dat );

-	 void _RTLRect( RECT *rect, int width, int offset );

-	 void _PaintRowItemsEx( HWND hwnd, HDC hdcMem, struct ClcData *dat, ClcContact *Drawing, RECT row_rc, RECT free_row_rc, int left_pos, int right_pos, int selected, int hottrack, RECT *rcPaint );

-	 void _DrawStatusIcon( ClcContact * Drawing, struct ClcData *dat, int iImage, HDC hdcMem, int x, int y, int cx, int cy, DWORD colorbg, DWORD colorfg, int mode );

-	 BOOL _DrawNonEnginedBackground( HWND hwnd, HDC hdcMem, RECT * rcPaint, RECT clRect, struct ClcData * dat );

-	 void _PaintClc( HWND hwnd, struct ClcData *dat, HDC hdc, RECT *rcPaint );

-	 void _StoreItemPos( ClcContact *contact, int ItemType, RECT * rc );

-	 void _CalcItemsPos( HWND hwnd, HDC hdcMem, struct ClcData *dat, ClcContact *Drawing, RECT *in_row_rc, RECT *in_free_row_rc, int left_pos, int right_pos, int selected, int hottrack );

-	 BOOL __IsVisible( RECT * firtRect, RECT * secondRect );

-	 void _GetBlendMode( IN struct ClcData *dat, IN ClcContact * Drawing, IN BOOL selected, IN BOOL hottrack, IN BOOL bFlag, OUT COLORREF * OutColourFg, OUT int * OutMode );

-	 void _DrawContactItems( HWND hwnd, HDC hdcMem, struct ClcData *dat, ClcContact *Drawing, RECT *row_rc, RECT *free_row_rc, int left_pos, int right_pos, int selected, int hottrack, RECT *rcPaint );

-	 void _PaintRowItems ( HWND hwnd, HDC hdcMem, struct ClcData *dat, ClcContact *Drawing, RECT row_rc, RECT free_row_rc, int left_pos, int right_pos, int selected, int hottrack, RECT *rcPaint );

-

-	 void _DrawContactAvatar    ( HDC hdcMem, struct ClcData *dat, ClcContact *Drawing, RECT *row_rc, int& selected, int& hottrack, RECT& text_rc, RECT * prcItem );

-	 void _DrawContactIcon      ( HDC hdcMem, struct ClcData *dat, ClcContact *Drawing, int& selected, int& hottrack, RECT& text_rc, RECT * prcItem );

-	 void _DrawContactText      ( HDC hdcMem, struct ClcData *dat, ClcContact *Drawing, int& selected, int& hottrack, RECT& text_rc, RECT * prcItem, UINT uTextFormat );

-	 void _DrawContactSubText   ( HDC hdcMem, struct ClcData *dat, ClcContact *Drawing, int& selected, int& hottrack, RECT& text_rc, RECT * prcItem, UINT uTextFormat, BYTE itemType );

-	 void _DrawContactTime      ( HDC hdcMem, struct ClcData *dat, ClcContact *Drawing, int& selected, int& hottrack, RECT& text_rc, RECT * prcItem );     

-	 void _DrawContactExtraIcon ( HDC hdcMem, struct ClcData *dat, ClcContact *Drawing, int& selected, int& hottrack, RECT& text_rc, RECT * rc, int iImage );

-	 void _DrawContactSelection ( HDC hdcMem, struct ClcData *dat, ClcContact *Drawing, int& selected, int& hottrack, RECT *rcPaint, RECT * prcItem );

-	 void _DrawContactLine      ( HDC hdcMem, struct ClcData *dat, ClcContact *Drawing, RECT *free_row_rc, RECT *rcPaint, RECT& text_rc );

-

-	 int _rcWidth( RECT *rc ) { return rc->right-rc->left; }

-	 int _rcHeight( RECT *rc ) { return rc->bottom-rc->top; }

+	void _FillQuickHash();

+	void _SetHotTrackColour(HDC hdc, ClcData *dat);

+	int  _GetStatusOnlineness(int status);

+	int  _GetGeneralisedStatus();

+	int  _GetRealStatus(ClcContact *pContact, int nStatus);

+	RECT _GetRectangle(ClcData *dat, RECT *row_rc, RECT *free_row_rc, int *left_pos, int *right_pos, BOOL left, int real_width, int width, int height, int horizontal_space);

+	void _DrawTextSmiley(HDC hdcMem, RECT *free_rc, SIZE * text_size, TCHAR *szText, int start, int len, SortedList *plText, UINT uTextFormat, BOOL ResizeSizeSmiley);

+	void _AddParameter(MODERNMASK *mpModernMask, MASKPARAM * lpParam);

+	void _AddParamShort(MODERNMASK *mpModernMask, DWORD dwParamIndex, DWORD dwValueIndex);

+	void _FillParam(MASKPARAM * lpParam, DWORD dwParamHash, const char* szValue, DWORD dwValueHash);

+	MODERNMASK* _GetCLCContactRowBackModernMask(ClcGroup *group, ClcContact *Drawing, int indent, int index, BOOL selected, BOOL hottrack, ClcData *dat);

+	void _RTLRect(RECT *rect, int width, int offset);

+	void _PaintRowItemsEx(HWND hwnd, HDC hdcMem, ClcData *dat, ClcContact *Drawing, RECT row_rc, RECT free_row_rc, int left_pos, int right_pos, int selected, int hottrack, RECT *rcPaint);

+	void _DrawStatusIcon(ClcContact *Drawing, ClcData *dat, int iImage, HDC hdcMem, int x, int y, int cx, int cy, DWORD colorbg, DWORD colorfg, int mode);

+	BOOL _DrawNonEnginedBackground(HWND hwnd, HDC hdcMem, RECT *rcPaint, RECT clRect, ClcData *dat);

+	void _PaintClc(HWND hwnd, ClcData *dat, HDC hdc, RECT *rcPaint);

+	void _StoreItemPos(ClcContact *contact, int ItemType, RECT *rc);

+	void _CalcItemsPos(HWND hwnd, HDC hdcMem, ClcData *dat, ClcContact *Drawing, RECT *in_row_rc, RECT *in_free_row_rc, int left_pos, int right_pos, int selected, int hottrack);

+	BOOL __IsVisible(RECT *firtRect, RECT *secondRect);

+	void _GetBlendMode(IN ClcData *dat, IN ClcContact *Drawing, IN BOOL selected, IN BOOL hottrack, IN BOOL bFlag, OUT COLORREF * OutColourFg, OUT int * OutMode);

+	void _DrawContactItems(HWND hwnd, HDC hdcMem, ClcData *dat, ClcContact *Drawing, RECT *row_rc, RECT *free_row_rc, int left_pos, int right_pos, int selected, int hottrack, RECT *rcPaint);

+	void _PaintRowItems (HWND hwnd, HDC hdcMem, ClcData *dat, ClcContact *Drawing, RECT row_rc, RECT free_row_rc, int left_pos, int right_pos, int selected, int hottrack, RECT *rcPaint);

+

+	void _DrawContactAvatar    (HDC hdcMem, ClcData *dat, ClcContact *Drawing, RECT *row_rc, int& selected, int& hottrack, RECT& text_rc, RECT *prcItem);

+	void _DrawContactIcon      (HDC hdcMem, ClcData *dat, ClcContact *Drawing, int& selected, int& hottrack, RECT& text_rc, RECT *prcItem);

+	void _DrawContactText      (HDC hdcMem, ClcData *dat, ClcContact *Drawing, int& selected, int& hottrack, RECT& text_rc, RECT *prcItem, UINT uTextFormat);

+	void _DrawContactSubText   (HDC hdcMem, ClcData *dat, ClcContact *Drawing, int& selected, int& hottrack, RECT& text_rc, RECT *prcItem, UINT uTextFormat, BYTE itemType);

+	void _DrawContactTime      (HDC hdcMem, ClcData *dat, ClcContact *Drawing, int& selected, int& hottrack, RECT& text_rc, RECT *prcItem);     

+	void _DrawContactExtraIcon (HDC hdcMem, ClcData *dat, ClcContact *Drawing, int& selected, int& hottrack, RECT& text_rc, RECT *rc, int iImage);

+	void _DrawContactSelection (HDC hdcMem, ClcData *dat, ClcContact *Drawing, int& selected, int& hottrack, RECT *rcPaint, RECT *prcItem);

+	void _DrawContactLine      (HDC hdcMem, ClcData *dat, ClcContact *Drawing, RECT *free_row_rc, RECT *rcPaint, RECT& text_rc);

+

+	int _rcWidth(RECT *rc) { return rc->right-rc->left; }

+	int _rcHeight(RECT *rc) { return rc->bottom-rc->top; }

 

 private:

 	enum enDrawMode 

@@ -145,14 +143,15 @@ private:
 		DM_DRAW_OFFSCREEN	= DM_FLOAT | DM_CONTROL | DM_NON_LAYERED | DM_CLASSIC, 

 	};

 

-	inline int _DetermineDrawMode( HWND hWnd, struct ClcData *dat );

+	inline int _DetermineDrawMode(HWND hWnd, ClcData *dat);

 

 	struct _PaintContext

 	{

 		enum 

-		{   release_none    = 0,

-		release_hdcmem2 = 1, 

-		release_hdcmem  = 2

+		{

+			release_none    = 0,

+			release_hdcmem2 = 1, 

+			release_hdcmem  = 2

 		};

 		HDC hdcMem;

 		HDC hdcMem2;

@@ -168,23 +167,21 @@ private:
 		COLORREF tmpforecolour;

 

 		DWORD fRelease;

-		_PaintContext( HDC _hdcMem = NULL) :

-		hdcMem ( _hdcMem ), hdcMem2( NULL ),

-			hBmpOsb2( NULL ), oldbmp2( NULL ),

-			hBmpOsb( NULL ), oldbmp( NULL ),

-			hBrushAlternateGrey ( NULL ),

-			tmpbkcolour( 0 ), tmpforecolour( 0 ),

-			fRelease ( release_none ) {};

+		_PaintContext(HDC _hdcMem = NULL) :

+		hdcMem (_hdcMem ), hdcMem2(NULL ),

+			hBmpOsb2(NULL ), oldbmp2(NULL ),

+			hBmpOsb(NULL ), oldbmp(NULL ),

+			hBrushAlternateGrey (NULL ),

+			tmpbkcolour(0 ), tmpforecolour(0 ),

+			fRelease (release_none) {};

 	};

 

-	inline void _PreparePaintContext( HWND hWnd, struct ClcData * dat, HDC hdc, int paintMode, RECT& clRect, _PaintContext& pc );

-	inline void _DrawBackground( HWND hWnd, struct ClcData * dat, HDC hdc, int paintMode, RECT* rcPaint, RECT& clRect, _PaintContext& pc );

-	inline void _DrawLines( HWND hWnd, struct ClcData * dat, HDC hdc, int paintMode, RECT* rcPaint, RECT& clRect, _PaintContext& pc );

-	inline void _DrawInsertionMark( struct ClcData * dat, RECT& clRect, _PaintContext& pc );

-	inline void _CopyPaintToDest( HWND hWnd, struct ClcData * dat, HDC hdc, int paintMode, RECT* rcPaint,  RECT& clRect, _PaintContext& pc );

-	inline void _FreePaintContext( _PaintContext& pc );

-

-	// void _PaintClcOld( HWND hwnd, struct ClcData *dat, HDC hdc, RECT *rcPaint );

+	inline void _PreparePaintContext(HWND hWnd, ClcData *dat, HDC hdc, int paintMode, RECT& clRect, _PaintContext& pc);

+	inline void _DrawBackground(HWND hWnd, ClcData *dat, HDC hdc, int paintMode, RECT* rcPaint, RECT& clRect, _PaintContext& pc);

+	inline void _DrawLines(HWND hWnd, ClcData *dat, HDC hdc, int paintMode, RECT* rcPaint, RECT& clRect, _PaintContext& pc);

+	inline void _DrawInsertionMark(ClcData *dat, RECT& clRect, _PaintContext& pc);

+	inline void _CopyPaintToDest(HWND hWnd, ClcData *dat, HDC hdc, int paintMode, RECT* rcPaint,  RECT& clRect, _PaintContext& pc);

+	inline void _FreePaintContext(_PaintContext& pc);

 };

 

 

diff --git a/plugins/Clist_modern/src/hdr/modern_clist.h b/plugins/Clist_modern/src/hdr/modern_clist.h
index 512b19509c..6a62ea3924 100644
--- a/plugins/Clist_modern/src/hdr/modern_clist.h
+++ b/plugins/Clist_modern/src/hdr/modern_clist.h
@@ -110,8 +110,6 @@ struct ClcCacheEntry : public ClcCacheEntryBase
 	void     freeName(void);

 };

 

-typedef ClcCacheEntry *pClcCacheEntry, *PDNCE;

-

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

 

 #define CLVM_FILTER_PROTOS			1

diff --git a/plugins/Clist_modern/src/hdr/modern_commonheaders.h b/plugins/Clist_modern/src/hdr/modern_commonheaders.h
index 6340d0c5c9..d54dec0392 100644
--- a/plugins/Clist_modern/src/hdr/modern_commonheaders.h
+++ b/plugins/Clist_modern/src/hdr/modern_commonheaders.h
@@ -309,13 +309,13 @@ int AniAva_UnloadModule();
 int AniAva_UpdateOptions();								   //reload options, //hot enable/disable engine

 

 int AniAva_AddAvatar(HANDLE hContact, TCHAR * szFilename, int width, int heigth);  // adds avatars to be displayed

-int AniAva_SetAvatarPos(HANDLE hContact, RECT * rc, int overlayIdx, BYTE bAlpha);	   // update avatars pos

+int AniAva_SetAvatarPos(HANDLE hContact, RECT *rc, int overlayIdx, BYTE bAlpha);	   // update avatars pos

 int AniAva_InvalidateAvatarPositions(HANDLE hContact);	   // reset positions of avatars to be drawn (still be painted at same place)

 int AniAva_RemoveInvalidatedAvatars();					   // all avatars without validated position will be stop painted and probably removed

 int AniAva_RemoveAvatar(HANDLE hContact);				   // remove avatar

 int AniAva_RedrawAllAvatars(BOOL updateZOrder);			   // request to repaint all

 void AniAva_UpdateParent();

-int AniAva_RenderAvatar( HANDLE hContact, HDC hdcMem, RECT * rc );

+int AniAva_RenderAvatar( HANDLE hContact, HDC hdcMem, RECT *rc );

 

 

 #define CCI_NAME			1

@@ -338,10 +338,10 @@ int AniAva_RenderAvatar( HANDLE hContact, HDC hdcMem, RECT * rc );
 #define CCI_OTHER			~( CCI_NAME|CCI_GROUP|CCI_PROTO|CCI_STATUS|CCI_LINES|CCI_TIME )

 #define CCI_ALL				(0xFFFFFFFF)

 

-void CListSettings_FreeCacheItemData(pClcCacheEntry pDst);

+void CListSettings_FreeCacheItemData(ClcCacheEntry *pDst);

 int CLUI_SyncGetPDNCE(WPARAM wParam, LPARAM lParam);

-WORD pdnce___GetStatus(pClcCacheEntry pdnce);

-void pdnce___SetStatus( pClcCacheEntry pdnce, WORD wStatus );

+WORD pdnce___GetStatus(ClcCacheEntry *pdnce);

+void pdnce___SetStatus( ClcCacheEntry *pdnce, WORD wStatus );

 

 /* move to list module */

 typedef void (*ItemDestuctor)(void*);

diff --git a/plugins/Clist_modern/src/hdr/modern_commonprototypes.h b/plugins/Clist_modern/src/hdr/modern_commonprototypes.h
index 6e3631e3b0..e0ca8cae74 100644
--- a/plugins/Clist_modern/src/hdr/modern_commonprototypes.h
+++ b/plugins/Clist_modern/src/hdr/modern_commonprototypes.h
@@ -106,7 +106,7 @@ HICON   CLUI_LoadIconFromExternalFile (char *filename,int i,BOOL UseLibrary,bool
 int     CLUI_OnSkinLoad(WPARAM wParam, LPARAM lParam);

 int     CLUI_ReloadCLUIOptions();

 int     CLUI_ShowFromBehindEdge();

-int     CLUI_SizingGetWindowRect(HWND hwnd,RECT * rc);

+int     CLUI_SizingGetWindowRect(HWND hwnd,RECT *rc);

 int     CLUI_SizingOnBorder(POINT ,int);

 int     CLUI_SmoothAlphaTransition(HWND hwnd, BYTE GoalAlpha, BOOL wParam);

 int     CLUI_TestCursorOnBorders();

@@ -129,16 +129,16 @@ void    EventArea_ConfigureEventArea();
 /* ModernSkinButton */

 int     ModernSkinButton_AddButton(HWND parent,char * ID,char * CommandService,char * StateDefService,char * HandeService,             int Left, int Top, int Right, int Bottom, DWORD AlignedTo,TCHAR * Hint,char * DBkey,char * TypeDef,int MinWidth, int MinHeight);

 int     ModernSkinButtonLoadModule();

-int     ModernSkinButton_ReposButtons(HWND parent, BYTE draw, RECT * r);

+int     ModernSkinButton_ReposButtons(HWND parent, BYTE draw, RECT *r);

 int     ModernSkinButtonUnloadModule(WPARAM,LPARAM);

 

 /* RowHeight */

-int     RowHeight_CalcRowHeight(struct ClcData *dat, HWND hwnd, ClcContact *contact, int item);

+int     RowHeight_CalcRowHeight(ClcData *dat, HWND hwnd, ClcContact *contact, int item);

 

 /* SkinEngine */

 BOOL    ske_AlphaBlend(HDC hdcDest,int nXOriginDest,int nYOriginDest,int nWidthDest,int nHeightDest,HDC hdcSrc,int nXOriginSrc,int nYOriginSrc,int nWidthSrc,int nHeightSrc,BLENDFUNCTION blendFunction);

 void    ske_ApplyTransluency(void);

-int     ske_BltBackImage (HWND destHWND, HDC destDC, RECT * BltClientRect);

+int     ske_BltBackImage (HWND destHWND, HDC destDC, RECT *BltClientRect);

 HBITMAP ske_CreateDIB32(int cx, int cy);

 HBITMAP ske_CreateDIB32Point(int cx, int cy, void ** bits);

 HRGN    ske_CreateOpaqueRgn(BYTE Level, bool Opaque);

@@ -146,21 +146,21 @@ HICON   ske_CreateJoinedIcon(HICON hBottom, HICON hTop,BYTE alpha);
 int     ske_DrawImageAt(HDC hdc, RECT *rc);

 BOOL    ske_DrawIconEx(HDC hdc,int xLeft,int yTop,HICON hIcon,int cxWidth,int cyWidth, UINT istepIfAniCur, HBRUSH hbrFlickerFreeDraw, UINT diFlags);

 int     ske_DrawNonFramedObjects(BOOL Erase,RECT *r);

-BOOL    ske_DrawText(HDC hdc, LPCTSTR lpString, int nCount, RECT * lpRect, UINT format);

-BOOL    ske_DrawTextA(HDC hdc, char * lpString, int nCount, RECT * lpRect, UINT format);

+BOOL    ske_DrawText(HDC hdc, LPCTSTR lpString, int nCount, RECT *lpRect, UINT format);

+BOOL    ske_DrawTextA(HDC hdc, char * lpString, int nCount, RECT *lpRect, UINT format);

 LPSKINOBJECTDESCRIPTOR   ske_FindObjectByName(const char * szName, BYTE objType, SKINOBJECTSLIST* Skin);

 HBITMAP ske_GetCurrentWindowImage();

 int     ske_GetFullFilename(char * buf, char *file, char * skinfolder,BOOL madeAbsolute);

 int     ske_GetSkinFolder(char * szFileName, char * t2);

 BOOL    ske_ImageList_DrawEx( HIMAGELIST himl,int i,HDC hdcDst,int x,int y,int dx,int dy,COLORREF rgbBk,COLORREF rgbFg,UINT fStyle);

 HICON   ske_ImageList_GetIcon(HIMAGELIST himl, int i, UINT fStyle);

-int     ske_JustUpdateWindowImageRect(RECT * rty);

+int     ske_JustUpdateWindowImageRect(RECT *rty);

 HBITMAP ske_LoadGlyphImage(char * szFileName);

 HRESULT SkinEngineLoadModule();

 void    ske_LoadSkinFromDB(void);

 int     ske_LoadSkinFromIniFile(TCHAR*, BOOL);

 TCHAR*  ske_ParseText(TCHAR *stzText);

-int     ske_PrepeareImageButDontUpdateIt(RECT * r);

+int     ske_PrepeareImageButDontUpdateIt(RECT *r);

 int     ske_ReCreateBackImage(BOOL Erase,RECT *w);

 int     ske_RedrawCompleteWindow();

 BOOL    ske_ResetTextEffect(HDC);

@@ -173,14 +173,14 @@ BOOL    ske_TextOutA(HDC hdc, int x, int y, char * lpString, int nCount);
 int     ske_UnloadGlyphImage(HBITMAP hbmp);

 int     SkinEngineUnloadModule();

 int     ske_UpdateWindowImage();

-int     ske_UpdateWindowImageRect(RECT * lpRect);

-int     ske_ValidateFrameImageProc(RECT * r);

+int     ske_UpdateWindowImageRect(RECT *lpRect);

+int     ske_ValidateFrameImageProc(RECT *r);

 

 /* CLUIFrames.c PROXIED */

 

 int CLUIFrames_ActivateSubContainers(BOOL wParam);

 int CLUIFrames_OnClistResize_mod(WPARAM wParam,LPARAM lParam);

-int CLUIFrames_OnMoving( HWND, RECT * );

+int CLUIFrames_OnMoving( HWND, RECT *);

 int CLUIFrames_OnShowHide( HWND hwnd, int mode );

 int CLUIFrames_SetLayeredMode( BOOL fLayeredMode, HWND hwnd );

 int CLUIFrames_SetParentForContainers( HWND parent );

@@ -188,8 +188,8 @@ int CLUIFramesOnClistResize(WPARAM wParam,LPARAM lParam);
 

 FRAMEWND * FindFrameByItsHWND(HWND FrameHwnd);                  //cluiframes.c

 

-//int callProxied_DrawTitleBar(HDC hdcMem2,RECT * rect,int Frameid);

-int DrawTitleBar(HDC hdcMem2,RECT * rect,int Frameid);

+//int callProxied_DrawTitleBar(HDC hdcMem2,RECT *rect,int Frameid);

+int DrawTitleBar(HDC hdcMem2,RECT *rect,int Frameid);

 

 int FindFrameID(HWND FrameHwnd);

 int SetAlpha(BYTE Alpha);

@@ -213,14 +213,14 @@ DWORD   CompareContacts2_getLMTime(HANDLE u);
 DWORD   mod_CalcHash(const char * a);                                          //mod_skin_selector.c

 HICON   cliGetIconFromStatusMode(HANDLE hContact, const char *szProto,int status);            //clistmod.c

 HICON   GetMainStatusOverlay(int STATUS);                                       //clc.c

-int     __fastcall CLVM_GetContactHiddenStatus(HANDLE hContact, char *szStatus, struct ClcData *dat);  //clcitems.c

+int     __fastcall CLVM_GetContactHiddenStatus(HANDLE hContact, char *szStatus, ClcData *dat);  //clcitems.c

 int     BgStatusBarChange(WPARAM wParam,LPARAM lParam);                              //clcopts.c

 int     ClcDoProtoAck(HANDLE wParam,ACKDATA * ack);                                 //clc.c

 int     ModernSkinButtonDeleteAll();                                                   //modernbutton.c

 int     GetAverageMode( void );                                                   //clisttray.c

 int     GetContactCachedStatus(HANDLE hContact);                                 //clistsettings.c

 INT_PTR GetContactIcon(WPARAM wParam,LPARAM lParam);                              //clistmod.c

-int     GetContactIconC(pClcCacheEntry cacheEntry);                           //clistmod.c

+int     GetContactIconC(ClcCacheEntry *cacheEntry);                           //clistmod.c

 int     GetContactIndex(ClcGroup *group,ClcContact *contact);               //clcidents.c

 int     GetStatusForContact(HANDLE hContact,char *szProto);                           //clistsettings.c

 int     InitCustomMenus(void);                                                //clistmenus.c

@@ -237,10 +237,10 @@ int     QueueAllFramesUpdating (BYTE);
 int     RecursiveDeleteMenu(HMENU hMenu);                                       //clistmenus.c

 int     ModernSkinButtonRedrawAll(HDC hdc);                                                //modern_button.c

 int     RegisterButtonByParce(char * ObjectName, char * Params);                     //mod_skin_selector.c

-int     RestoreAllContactData(struct ClcData *dat);                                 //cache_funcs.c

+int     RestoreAllContactData(ClcData *dat);                                 //cache_funcs.c

 

-int     SkinSelector_DeleteMask(MODERNMASK * mm);                                 //mod_skin_selector.c

-int     StoreAllContactData(struct ClcData *dat);                                 //cache_func.c

+int     SkinSelector_DeleteMask(MODERNMASK *mm);                                 //mod_skin_selector.c

+int     StoreAllContactData(ClcData *dat);                                 //cache_func.c

 INT_PTR ToggleHideOffline(WPARAM wParam,LPARAM lParam);                              //contact.c

 INT_PTR ToggleGroups(WPARAM wParam,LPARAM lParam);                                 //contact.c

 INT_PTR SetUseGroups(WPARAM wParam,LPARAM lParam);                                 //contact.c

@@ -252,13 +252,13 @@ void    DrawAvatarImageWithGDIp(HDC hDestDC,int x, int y, DWORD width, DWORD hei
 void    FreeRowCell();                                                      //RowHeight

 void    InitGdiPlus();                                                      //gdiplus.cpp

 void    InitTray();                                                         //clisttray.c

-void    InvalidateDNCEbyPointer(HANDLE hContact,pClcCacheEntry pdnce,int SettingType);  //clistsettings.c

+void    InvalidateDNCEbyPointer(HANDLE hContact,ClcCacheEntry *pdnce,int SettingType);  //clistsettings.c

 void    ShutdownGdiPlus();                                                   //gdiplus.cpp

 void    TextOutWithGDIp(HDC hDestDC, int x, int y, LPCTSTR lpString, int nCount);         //gdiplus.cpp

 void    UninitCustomMenus();                                                //clistmenus.c

 void    UnloadAvatarOverlayIcon();                                             //clc.c

 void    UnLoadContactListModule();                                             //clistmod.c

-void    UpdateAllAvatars(struct ClcData *dat);                                    //cache_func.c

+void    UpdateAllAvatars(ClcData *dat);                                    //cache_func.c

 

 //cluiframes.c

 void    gtaRenewText(HANDLE hContact);

@@ -277,38 +277,38 @@ void    CustomizeButton(HWND);
 

 // INTERFACES

 

-void    cliCheckCacheItem(pClcCacheEntry pdnce);

-void    cliFreeCacheItem( pClcCacheEntry p );

-void    cliRebuildEntireList(HWND hwnd,struct ClcData *dat);

-void    cliRecalcScrollBar(HWND hwnd,struct ClcData *dat);

+void    cliCheckCacheItem(ClcCacheEntry *pdnce);

+void    cliFreeCacheItem( ClcCacheEntry *p );

+void    cliRebuildEntireList(HWND hwnd,ClcData *dat);

+void    cliRecalcScrollBar(HWND hwnd,ClcData *dat);

 void    CLUI_cliOnCreateClc(void);

 int     cli_AddItemToGroup(ClcGroup *group, int iAboveItem);

 int     cli_AddInfoItemToGroup(ClcGroup *group,int flags,const TCHAR *pszText);

 int     cliGetGroupContentsCount(ClcGroup *group, int visibleOnly);

-int     cliFindRowByText(HWND hwnd, struct ClcData *dat, const TCHAR *text, int prefixOk);

+int     cliFindRowByText(HWND hwnd, ClcData *dat, const TCHAR *text, int prefixOk);

 int     cliGetRowsPriorTo(ClcGroup *group,ClcGroup *subgroup,int contactIndex);

 int     cli_IconFromStatusMode(const char *szProto,int nStatus, HANDLE hContact);

 int     cli_RemoveEvent(HANDLE hContact, HANDLE hDbEvent);

-void    cli_AddContactToTree(HWND hwnd,struct ClcData *dat,HANDLE hContact,int updateTotalCount,int checkHideOffline);

+void    cli_AddContactToTree(HWND hwnd,ClcData *dat,HANDLE hContact,int updateTotalCount,int checkHideOffline);

 void    cli_DeleteItemFromTree(HWND hwnd, HANDLE hItem);

 void    cli_FreeContact( ClcContact* );

 void    cli_FreeGroup( ClcGroup* );

-char*   cli_GetGroupCountsText(struct ClcData *dat, ClcContact *contact);

+char*   cli_GetGroupCountsText(ClcData *dat, ClcContact *contact);

 void    cli_ChangeContactIcon(HANDLE hContact,int iIcon,int add);

-LRESULT cli_ProcessExternalMessages(HWND hwnd,struct ClcData *dat,UINT msg,WPARAM wParam,LPARAM lParam);

+LRESULT cli_ProcessExternalMessages(HWND hwnd,ClcData *dat,UINT msg,WPARAM wParam,LPARAM lParam);

 struct  CListEvent* cliCreateEvent( void );

 struct  CListEvent* cli_AddEvent(CLISTEVENT *cle);

 LRESULT CALLBACK cli_ContactListControlWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam);

 int     cliShowHide(WPARAM wParam,LPARAM lParam);

 BOOL    CLUI__cliInvalidateRect(HWND hWnd, CONST RECT* lpRect,BOOL bErase );

 int     cliCompareContacts(const ClcContact *contact1,const ClcContact *contact2);

-int     cliFindItem(HWND hwnd,struct ClcData *dat,HANDLE hItem,ClcContact **contact,ClcGroup **subgroup,int *isVisible);

+int     cliFindItem(HWND hwnd,ClcData *dat,HANDLE hItem,ClcContact **contact,ClcGroup **subgroup,int *isVisible);

 void    cliTrayIconUpdateBase(const char *szChangedProto);

 void    cliCluiProtocolStatusChanged(int status,const char * proto);

 HMENU   cliBuildGroupPopupMenu(ClcGroup *group);

 void    cliInvalidateDisplayNameCacheEntry(HANDLE hContact);

-void    cliCheckCacheItem(pClcCacheEntry pdnce);

-void    cli_SaveStateAndRebuildList(HWND hwnd, struct ClcData *dat);

+void    cliCheckCacheItem(ClcCacheEntry *pdnce);

+void    cli_SaveStateAndRebuildList(HWND hwnd, ClcData *dat);

 void    CLUI_cli_LoadCluiGlobalOpts(void);

 INT_PTR cli_TrayIconProcessMessage(WPARAM wParam,LPARAM lParam);

 BOOL    CLUI__cliInvalidateRect(HWND hWnd, CONST RECT* lpRect,BOOL bErase );

@@ -335,7 +335,7 @@ struct DWM_BLURBEHIND
 };

 extern HRESULT (WINAPI *g_proc_DWMEnableBlurBehindWindow)(HWND hWnd, DWM_BLURBEHIND *pBlurBehind);

 

-extern tPaintCallbackProc CLCPaint_PaintCallbackProc(HWND hWnd, HDC hDC, RECT * rcPaint, HRGN rgn, DWORD dFlags, void * CallBackData);

+extern tPaintCallbackProc CLCPaint_PaintCallbackProc(HWND hWnd, HDC hDC, RECT *rcPaint, HRGN rgn, DWORD dFlags, void * CallBackData);

 extern BOOL (WINAPI *MySetProcessWorkingSetSize)(HANDLE,SIZE_T,SIZE_T);

 

 /* SkinEngine.c */

diff --git a/plugins/Clist_modern/src/hdr/modern_gettextasync.h b/plugins/Clist_modern/src/hdr/modern_gettextasync.h
index 3a4d9639bc..b0e08b64a2 100644
--- a/plugins/Clist_modern/src/hdr/modern_gettextasync.h
+++ b/plugins/Clist_modern/src/hdr/modern_gettextasync.h
@@ -2,4 +2,4 @@
 void InitCacheAsync();

 void UninitCacheAsync();

 void gtaRenewText(HANDLE hContact);

-int gtaAddRequest(struct ClcData *dat,ClcContact *contact,HANDLE hContact);

+int gtaAddRequest(ClcData *dat,ClcContact *contact,HANDLE hContact);

diff --git a/plugins/Clist_modern/src/hdr/modern_layered_window_engine.h b/plugins/Clist_modern/src/hdr/modern_layered_window_engine.h
index 918bfabf37..5116828af5 100644
--- a/plugins/Clist_modern/src/hdr/modern_layered_window_engine.h
+++ b/plugins/Clist_modern/src/hdr/modern_layered_window_engine.h
@@ -1,7 +1,7 @@
 #pragma once

 #include "../m_api/m_skin_eng.h"

 

-// typedef int (/*__stdcall*/ *tPaintCallbackProc)(HWND hWnd, HDC hDC, RECT * rcPaint, HRGN rgnUpdate, DWORD dFlags, void * CallBackData);

+// typedef int (/*__stdcall*/ *tPaintCallbackProc)(HWND hWnd, HDC hDC, RECT *rcPaint, HRGN rgnUpdate, DWORD dFlags, void * CallBackData);

 

 class CLayeredWindowEngine

 {

@@ -40,8 +40,8 @@ public:
 	void LweValidatorProcWorker();

 

 	void LweValidatorWorker();

-	int LweInvalidateRect( HWND hWnd, const RECT * rect, BOOL bErase );

-	// int LweValidateWindowRect( HWND hWnd, RECT * rect );

+	int LweInvalidateRect( HWND hWnd, const RECT *rect, BOOL bErase );

+	// int LweValidateWindowRect( HWND hWnd, RECT *rect );

 	// int RegisterWindow( HWND hwnd, tPaintCallbackProc pPaintCallBackProc );

 

 };

diff --git a/plugins/Clist_modern/src/hdr/modern_rowheight_funcs.h b/plugins/Clist_modern/src/hdr/modern_rowheight_funcs.h
index ea74b5498f..b6267364d0 100644
--- a/plugins/Clist_modern/src/hdr/modern_rowheight_funcs.h
+++ b/plugins/Clist_modern/src/hdr/modern_rowheight_funcs.h
@@ -37,34 +37,34 @@ Created by Pescuma
 

 

 

-BOOL RowHeights_Initialize(struct ClcData *dat);

-void RowHeights_Free(struct ClcData *dat);

-void RowHeights_Clear(struct ClcData *dat);

+BOOL RowHeights_Initialize(ClcData *dat);

+void RowHeights_Free(ClcData *dat);

+void RowHeights_Clear(ClcData *dat);

 

-BOOL RowHeights_Alloc(struct ClcData *dat, int size);

+BOOL RowHeights_Alloc(ClcData *dat, int size);

 

 // Calc and store max row height

-int RowHeights_GetMaxRowHeight(struct ClcData *dat, HWND hwnd);

+int RowHeights_GetMaxRowHeight(ClcData *dat, HWND hwnd);

 

 // Calc and store row height

-int RowHeights_GetRowHeight(struct ClcData *dat, HWND hwnd, ClcContact *contact, int item);

+int RowHeights_GetRowHeight(ClcData *dat, HWND hwnd, ClcContact *contact, int item);

 

 // Calc and store row height for all itens in the list

-void RowHeights_CalcRowHeights(struct ClcData *dat, HWND hwnd);

+void RowHeights_CalcRowHeights(ClcData *dat, HWND hwnd);

 

 // Calc item top Y (using stored data)

-int cliGetRowTopY(struct ClcData *dat, int item);

+int cliGetRowTopY(ClcData *dat, int item);

 

 // Calc item bottom Y (using stored data)

-int cliGetRowBottomY(struct ClcData *dat, int item);

+int cliGetRowBottomY(ClcData *dat, int item);

 

 // Calc total height of rows (using stored data)

-int cliGetRowTotalHeight(struct ClcData *dat);

+int cliGetRowTotalHeight(ClcData *dat);

 

 // Return the line that pos_y is at or -1 (using stored data). Y start at 0

-int cliRowHitTest(struct ClcData *dat, int pos_y);

+int cliRowHitTest(ClcData *dat, int pos_y);

 

 // Returns the height of the chosen row

-int cliGetRowHeight(struct ClcData *dat, int item);

+int cliGetRowHeight(ClcData *dat, int item);

 

 #endif // __ROWHEIGHT_FUNCS_H__

diff --git a/plugins/Clist_modern/src/hdr/modern_skinselector.h b/plugins/Clist_modern/src/hdr/modern_skinselector.h
index b6918b6638..4e75fdecc5 100644
--- a/plugins/Clist_modern/src/hdr/modern_skinselector.h
+++ b/plugins/Clist_modern/src/hdr/modern_skinselector.h
@@ -64,7 +64,7 @@ struct LISTMODERNMASK
 };

 

 /// PROTOTYPES

-int AddModernMaskToList(MODERNMASK * mm,  LISTMODERNMASK * mmTemplateList);

+int AddModernMaskToList(MODERNMASK *mm,  LISTMODERNMASK * mmTemplateList);

 int AddStrModernMaskToList(DWORD maskID, char * szStr, char * objectName,  LISTMODERNMASK * mmTemplateList, void * pObjectList);

 int SortMaskList(LISTMODERNMASK * mmList);

 

@@ -72,16 +72,16 @@ int DeleteMaskByItID(DWORD mID,LISTMODERNMASK * mmTemplateList);
 int ClearMaskList(LISTMODERNMASK * mmTemplateList);

 int ExchangeMasksByID(DWORD mID1, DWORD mID2, LISTMODERNMASK * mmTemplateList);

 

-int ParseToModernMask(MODERNMASK * mm, char * szText);

-BOOL CompareModernMask(MODERNMASK * mmValue,MODERNMASK * mmTemplate);

-BOOL CompareStrWithModernMask(char * szValue,MODERNMASK * mmTemplate);

-MODERNMASK *  FindMaskByStr(char * szValue,LISTMODERNMASK * mmTemplateList);

+int ParseToModernMask(MODERNMASK *mm, char * szText);

+BOOL CompareModernMask(MODERNMASK *mmValue,MODERNMASK *mmTemplate);

+BOOL CompareStrWithModernMask(char * szValue,MODERNMASK *mmTemplate);

+MODERNMASK * FindMaskByStr(char * szValue,LISTMODERNMASK * mmTemplateList);

 DWORD mod_CalcHash(const char * a);

-char * ModernMaskToString(MODERNMASK * mm, char * buf, UINT bufsize);

+char * ModernMaskToString(MODERNMASK *mm, char * buf, UINT bufsize);

 BOOL __inline wildcmp(const char * name, const char * mask, BYTE option);

 int RegisterObjectByParce(char * ObjectName, char * Params);

 SKINOBJECTDESCRIPTOR *  skin_FindObjectByRequest(char * szValue,LISTMODERNMASK * mmTemplateList);

-SKINOBJECTDESCRIPTOR *  skin_FindObjectByMask (MODERNMASK * mm,LISTMODERNMASK * mmTemplateList);

+SKINOBJECTDESCRIPTOR *  skin_FindObjectByMask (MODERNMASK *mm,LISTMODERNMASK * mmTemplateList);

 TCHAR * GetParamNT(char * string, TCHAR * buf, int buflen, BYTE paramN, char Delim, BOOL SkipSpaces);

-int SkinDrawGlyphMask(HDC hdc, RECT * rcSize, RECT * rcClip, MODERNMASK * ModernMask);

+int SkinDrawGlyphMask(HDC hdc, RECT *rcSize, RECT *rcClip, MODERNMASK *ModernMask);

 #endif

diff --git a/plugins/Clist_modern/src/hdr/modern_static_clui.h b/plugins/Clist_modern/src/hdr/modern_static_clui.h
index 892a126680..7a7d205f14 100644
--- a/plugins/Clist_modern/src/hdr/modern_static_clui.h
+++ b/plugins/Clist_modern/src/hdr/modern_static_clui.h
@@ -59,14 +59,14 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 /* Declaration of prototypes in other modules */
 
 int ClcUnloadModule();
-int ClcGetShortData(struct ClcData* pData, struct SHORTDATA *pShortData);
+int ClcGetShortData(ClcData* pData, struct SHORTDATA *pShortData);
 int ClcEnterDragToScroll(HWND hwnd, int Y);
 
 int CListMod_ContactListShutdownProc(WPARAM wParam,LPARAM lParam);
 int CListMod_HideWindow(HWND hwndContactList, int mode);
 
-int CListSettings_GetCopyFromCache(pClcCacheEntry pDest, DWORD flag);
-int CListSettings_SetToCache(pClcCacheEntry pSrc, DWORD flag);
+int CListSettings_GetCopyFromCache(ClcCacheEntry *pDest, DWORD flag);
+int CListSettings_SetToCache(ClcCacheEntry *pSrc, DWORD flag);
 
 int CLUIServices_LoadModule(void);
 INT_PTR CLUIServices_SortList(WPARAM wParam,LPARAM lParam);
@@ -90,7 +90,7 @@ int ske_JustUpdateWindowImage();
 void ske_LoadSkinFromDB(void);
 int ske_RedrawCompleteWindow();
 int ske_UpdateWindowImage();
-int ske_ValidateFrameImageProc(RECT * r);
+int ske_ValidateFrameImageProc(RECT *r);
 
 HWND StatusBar_Create(HWND parent);