diff options
| author | George Hazan <george.hazan@gmail.com> | 2012-11-15 17:29:58 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2012-11-15 17:29:58 +0000 |
| commit | e311fc5f472c169ec0f25729fa5070fdd4a6c805 (patch) | |
| tree | b63a187d53fc6a061422a851ae3dbd8123be909a | |
| parent | 6cd8cc0b3461df48269fac24aad474154fb040b2 (diff) | |
clist_modern: code cleaning
git-svn-id: http://svn.miranda-ng.org/main/trunk@2318 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
35 files changed, 473 insertions, 524 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); diff --git a/plugins/Clist_modern/src/modern_aniavatars.cpp b/plugins/Clist_modern/src/modern_aniavatars.cpp index b626671b03..60d253c028 100644 --- a/plugins/Clist_modern/src/modern_aniavatars.cpp +++ b/plugins/Clist_modern/src/modern_aniavatars.cpp @@ -161,7 +161,7 @@ static void __AniAva_DebugRenderStrip(); static void _AniAva_DestroyAvatarWindow( HWND hwnd);
static void _AniAva_Clear_ANIAVA_WINDOWINFO(ANIAVA_WINDOWINFO * pavwi );
-static void _AniAva_RenderAvatar(ANIAVA_WINDOWINFO * dat, HDC hdcParent = NULL, RECT * rcInParent = NULL );
+static void _AniAva_RenderAvatar(ANIAVA_WINDOWINFO * dat, HDC hdcParent = NULL, RECT *rcInParent = NULL );
static void _AniAva_PausePainting();
static void _AniAva_ResumePainting();
static void _AniAva_LoadOptions();
@@ -373,7 +373,7 @@ ANIAVA_OBJECT * FindAvatarByContact( HANDLE hContact ) return NULL;
}
-int AniAva_RenderAvatar( HANDLE hContact, HDC hdcMem, RECT * rc )
+int AniAva_RenderAvatar( HANDLE hContact, HDC hdcMem, RECT *rc )
{
aacheck 0;
aalock;
@@ -384,7 +384,7 @@ int AniAva_RenderAvatar( HANDLE hContact, HDC hdcMem, RECT * rc ) return 0;
}
// update avatars pos
-int AniAva_SetAvatarPos(HANDLE hContact, RECT * rc, int overlayIdx, BYTE bAlpha)
+int AniAva_SetAvatarPos(HANDLE hContact, RECT *rc, int overlayIdx, BYTE bAlpha)
{
aacheck 0;
aalock;
@@ -781,7 +781,7 @@ static void __AniAva_DebugRenderStrip() #endif
}
-static void _AniAva_RenderAvatar(ANIAVA_WINDOWINFO * dat, HDC hdcParent /*= NULL*/, RECT * rcInParent /*= NULL */ )
+static void _AniAva_RenderAvatar(ANIAVA_WINDOWINFO * dat, HDC hdcParent /*= NULL*/, RECT *rcInParent /*= NULL */ )
{
if (dat->bPaused>0) { dat->bPended = TRUE; return; }
else dat->bPended = FALSE;
diff --git a/plugins/Clist_modern/src/modern_cachefuncs.cpp b/plugins/Clist_modern/src/modern_cachefuncs.cpp index 40c62b2d2d..2d95a3d58f 100644 --- a/plugins/Clist_modern/src/modern_cachefuncs.cpp +++ b/plugins/Clist_modern/src/modern_cachefuncs.cpp @@ -48,19 +48,19 @@ typedef BOOL (* ExecuteOnAllContactsFuncPtr) (ClcContact *contact, BOOL subconta static int CopySkipUnprintableChars(TCHAR *to, TCHAR * buf, DWORD size);
-static BOOL ExecuteOnAllContacts(struct ClcData *dat, ExecuteOnAllContactsFuncPtr func, void *param);
+static BOOL ExecuteOnAllContacts(ClcData *dat, ExecuteOnAllContactsFuncPtr func, void *param);
static BOOL ExecuteOnAllContactsOfGroup(ClcGroup *group, ExecuteOnAllContactsFuncPtr func, void *param);
int CLUI_SyncGetShortData(WPARAM wParam, LPARAM lParam);
-void CListSettings_FreeCacheItemData(pClcCacheEntry pDst);
-void CListSettings_FreeCacheItemDataOption( pClcCacheEntry pDst, DWORD flag );
+void CListSettings_FreeCacheItemData(ClcCacheEntry *pDst);
+void CListSettings_FreeCacheItemDataOption( ClcCacheEntry *pDst, DWORD flag );
/*
-* Get time zone for contact
-*/
-void Cache_GetTimezone(struct ClcData *dat, HANDLE hContact)
+ * Get time zone for contact
+ */
+void Cache_GetTimezone(ClcData *dat, HANDLE hContact)
{
- PDNCE pdnce = (PDNCE)pcli->pfnGetCacheEntry(hContact);
+ ClcCacheEntry *pdnce = pcli->pfnGetCacheEntry(hContact);
if (dat == NULL && pcli->hwndContactTree)
- dat = (struct ClcData *)GetWindowLongPtr(pcli->hwndContactTree,0);
+ dat = (ClcData *)GetWindowLongPtr(pcli->hwndContactTree,0);
if (dat && dat->hWnd == pcli->hwndContactTree) {
DWORD flags = dat->contact_time_show_only_if_different ? TZF_DIFONLY : 0;
@@ -69,21 +69,20 @@ void Cache_GetTimezone(struct ClcData *dat, HANDLE hContact) }
/*
-* Get all lines of text
-*/
+ * Get all lines of text
+ */
-void Cache_GetText(struct ClcData *dat, ClcContact *contact, BOOL forceRenew)
+void Cache_GetText(ClcData *dat, ClcContact *contact, BOOL forceRenew)
{
Cache_GetFirstLineText(dat, contact);
if ( !dat->force_in_dialog) {
- PDNCE pdnce = (PDNCE)pcli->pfnGetCacheEntry(contact->hContact);
-
+ ClcCacheEntry *pdnce = pcli->pfnGetCacheEntry(contact->hContact);
if ((dat->second_line_show && (forceRenew || pdnce->szSecondLineText == NULL)) || (dat->third_line_show && (forceRenew || pdnce->szThirdLineText == NULL)))
gtaAddRequest(dat,contact, contact->hContact);
}
}
-void CSmileyString::AddListeningToIcon(struct SHORTDATA *dat, pClcCacheEntry pdnce, TCHAR *szText, BOOL replace_smileys)
+void CSmileyString::AddListeningToIcon(struct SHORTDATA *dat, ClcCacheEntry *pdnce, TCHAR *szText, BOOL replace_smileys)
{
iMaxSmileyHeight = 0;
DestroySmileyList();
@@ -96,19 +95,17 @@ void CSmileyString::AddListeningToIcon(struct SHORTDATA *dat, pClcCacheEntry pdn // Add Icon
{
- BITMAP bm;
-
- ICONINFO icon;
ClcContactTextPiece *piece = (ClcContactTextPiece *) mir_alloc(sizeof(ClcContactTextPiece));
-
piece->type = TEXT_PIECE_TYPE_SMILEY;
piece->len = 0;
piece->smiley = g_hListeningToIcon;
-
piece->smiley_width = 16;
piece->smiley_height = 16;
- if (GetIconInfo(piece->smiley, &icon)) {
- if (GetObject(icon.hbmColor,sizeof(BITMAP),&bm)) {
+
+ ICONINFO icon;
+ if ( GetIconInfo(piece->smiley, &icon)) {
+ BITMAP bm;
+ if (GetObject(icon.hbmColor, sizeof(BITMAP), &bm)) {
piece->smiley_width = bm.bmWidth;
piece->smiley_height = bm.bmHeight;
}
@@ -188,7 +185,7 @@ void CSmileyString::DestroySmileyList() * Parsing of text for smiley
*/
-void CSmileyString::ReplaceSmileys(struct SHORTDATA *dat, PDNCE pdnce, TCHAR * szText, BOOL replace_smileys)
+void CSmileyString::ReplaceSmileys(struct SHORTDATA *dat, ClcCacheEntry *pdnce, TCHAR * szText, BOOL replace_smileys)
{
SMADD_BATCHPARSE2 sp = {0};
SMADD_BATCHPARSERES *spr;
@@ -290,7 +287,7 @@ void CSmileyString::ReplaceSmileys(struct SHORTDATA *dat, PDNCE pdnce, TCHAR * s * Getting Status name
* -1 for XStatus, 1 for Status
*/
-int GetStatusName(TCHAR *text, int text_size, PDNCE pdnce, BOOL xstatus_has_priority)
+int GetStatusName(TCHAR *text, int text_size, ClcCacheEntry *pdnce, BOOL xstatus_has_priority)
{
BOOL noAwayMsg = FALSE;
BOOL noXstatus = FALSE;
@@ -341,7 +338,7 @@ int GetStatusName(TCHAR *text, int text_size, PDNCE pdnce, BOOL xstatus_has_prio * Get Listening to information
*/
-void GetListeningTo(TCHAR *text, int text_size, PDNCE pdnce)
+void GetListeningTo(TCHAR *text, int text_size, ClcCacheEntry *pdnce)
{
DBVARIANT dbv = {0};
WORD wStatus = pdnce___GetStatus( pdnce );
@@ -361,7 +358,7 @@ void GetListeningTo(TCHAR *text, int text_size, PDNCE pdnce) * -1 for XStatus, 1 for Status
*/
-int GetStatusMessage(TCHAR *text, int text_size, PDNCE pdnce, BOOL xstatus_has_priority)
+int GetStatusMessage(TCHAR *text, int text_size, ClcCacheEntry *pdnce, BOOL xstatus_has_priority)
{
DBVARIANT dbv = {0};
BOOL noAwayMsg = FALSE;
@@ -416,7 +413,7 @@ int GetStatusMessage(TCHAR *text, int text_size, PDNCE pdnce, BOOL xstatus_has_ * Get the text for specified lines
*/
int Cache_GetLineText(
- PDNCE pdnce, int type, LPTSTR text, int text_size, TCHAR *variable_text, BOOL xstatus_has_priority,
+ 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)
{
@@ -519,12 +516,12 @@ int Cache_GetLineText( /*
* Get the text for First Line
*/
-void Cache_GetFirstLineText(struct ClcData *dat, ClcContact *contact)
+void Cache_GetFirstLineText(ClcData *dat, ClcContact *contact)
{
if (GetCurrentThreadId() != g_dwMainThreadID)
return;
- PDNCE pdnce = (PDNCE)pcli->pfnGetCacheEntry(contact->hContact);
+ ClcCacheEntry *pdnce = pcli->pfnGetCacheEntry(contact->hContact);
TCHAR *name = pcli->pfnGetContactDisplayName(contact->hContact,0);
if (dat->first_line_append_nick && (!dat->force_in_dialog)) {
DBVARIANT dbv = {0};
@@ -555,7 +552,7 @@ void Cache_GetFirstLineText(struct ClcData *dat, ClcContact *contact) * Get the text for Second Line
*/
-void Cache_GetSecondLineText(struct SHORTDATA *dat, PDNCE pdnce)
+void Cache_GetSecondLineText(struct SHORTDATA *dat, ClcCacheEntry *pdnce)
{
TCHAR Text[240-EXTRA_ICON_COUNT] = {0};
int type = TEXT_EMPTY;
@@ -584,7 +581,7 @@ void Cache_GetSecondLineText(struct SHORTDATA *dat, PDNCE pdnce) /*
* Get the text for Third Line
*/
-void Cache_GetThirdLineText(struct SHORTDATA *dat, PDNCE pdnce)
+void Cache_GetThirdLineText(struct SHORTDATA *dat, ClcCacheEntry *pdnce)
{
TCHAR Text[240-EXTRA_ICON_COUNT] = {0};
int type = TEXT_EMPTY;
@@ -672,7 +669,7 @@ static int CopySkipUnprintableChars(TCHAR *to, TCHAR * buf, DWORD size) // If ExecuteOnAllContactsFuncPtr returns FALSE, stop loop
// Return TRUE if finished, FALSE if was stoped
-static BOOL ExecuteOnAllContacts(struct ClcData *dat, ExecuteOnAllContactsFuncPtr func, void *param)
+static BOOL ExecuteOnAllContacts(ClcData *dat, ExecuteOnAllContactsFuncPtr func, void *param)
{
BOOL res;
res = ExecuteOnAllContactsOfGroup(&dat->list, func, param);
@@ -709,11 +706,11 @@ static BOOL ExecuteOnAllContactsOfGroup(ClcGroup *group, ExecuteOnAllContactsFun */
BOOL UpdateAllAvatarsProxy(ClcContact *contact, BOOL subcontact, void *param)
{
- Cache_GetAvatar((struct ClcData *)param, contact);
+ Cache_GetAvatar((ClcData *)param, contact);
return TRUE;
}
-void UpdateAllAvatars(struct ClcData *dat)
+void UpdateAllAvatars(ClcData *dat)
{
ExecuteOnAllContacts(dat,UpdateAllAvatarsProxy,dat);
}
@@ -726,7 +723,7 @@ BOOL ReduceAvatarPosition(ClcContact *contact, BOOL subcontact, void *param) return TRUE;
}
-void Cache_ProceedAvatarInList(struct ClcData *dat, ClcContact *contact)
+void Cache_ProceedAvatarInList(ClcData *dat, ClcContact *contact)
{
struct avatarCacheEntry * ace = contact->avatar_data;
int old_pos = contact->avatar_pos;
@@ -832,7 +829,7 @@ void Cache_ProceedAvatarInList(struct ClcData *dat, ClcContact *contact) }
}
-void Cache_GetAvatar(struct ClcData *dat, ClcContact *contact)
+void Cache_GetAvatar(ClcData *dat, ClcContact *contact)
{
int old_pos = contact->avatar_pos;
// workaround for avatar service and other wich destroys service on OK_TOEXIT
diff --git a/plugins/Clist_modern/src/modern_clc.cpp b/plugins/Clist_modern/src/modern_clc.cpp index 6d5e14d957..a905536b03 100644 --- a/plugins/Clist_modern/src/modern_clc.cpp +++ b/plugins/Clist_modern/src/modern_clc.cpp @@ -54,7 +54,7 @@ HANDLE hIconChangedHook = NULL; HANDLE hAckHook = NULL;
HANDLE hAvatarChanged = NULL;
static BOOL g_bSortTimerIsSet = FALSE;
-static ClcContact * hitcontact = NULL;
+static ClcContact *hitcontact = NULL;
static int clcHookSmileyAddOptionsChanged(WPARAM wParam,LPARAM lParam);
@@ -267,9 +267,8 @@ static int clcHookDbEventAdded(WPARAM wParam,LPARAM lParam) dbei.pBlob = 0;
dbei.cbBlob = 0;
CallService(MS_DB_EVENT_GET, (WPARAM)lParam, (LPARAM)&dbei);
- if (dbei.eventType == EVENTTYPE_MESSAGE && !(dbei.flags & DBEF_SENT))
- {
- PDNCE pdnce = (PDNCE)pcli->pfnGetCacheEntry((HANDLE)wParam);
+ if (dbei.eventType == EVENTTYPE_MESSAGE && !(dbei.flags & DBEF_SENT)) {
+ ClcCacheEntry *pdnce = pcli->pfnGetCacheEntry((HANDLE)wParam);
db_set_dw((HANDLE)wParam, "CList", "mf_lastmsg", dbei.timestamp);
if (pdnce)
pdnce->dwLastMsgTime = dbei.timestamp;
@@ -314,7 +313,7 @@ static int clcProceedDragToScroll(HWND hwnd, int Y) -static int clcSearchNextContact(HWND hwnd, struct ClcData *dat, int index, const TCHAR *text, int prefixOk, BOOL fSearchUp)
+static int clcSearchNextContact(HWND hwnd, ClcData *dat, int index, const TCHAR *text, int prefixOk, BOOL fSearchUp)
{
ClcGroup *group = &dat->list;
int testlen = lstrlen(text);
@@ -377,27 +376,24 @@ static int clcSearchNextContact(HWND hwnd, struct ClcData *dat, int index, const return -1;
}
-static BOOL clcItemNotHiddenOffline(struct ClcData * dat, ClcGroup* group, ClcContact * contact)
+static BOOL clcItemNotHiddenOffline(ClcData *dat, ClcGroup* group, ClcContact *contact)
{
- PDNCE pdnce;
-
- if ( !group) return FALSE;
- if ( !contact) return FALSE;
+ if (!group || !contact) return FALSE;
if (group->hideOffline) return FALSE;
if (g_CluiData.bFilterEffective) return FALSE;
if (CLCItems_IsShowOfflineGroup(group)) return TRUE;
- pdnce = (PDNCE)pcli->pfnGetCacheEntry( contact->hContact);
+ ClcCacheEntry *pdnce = pcli->pfnGetCacheEntry( contact->hContact);
if ( !pdnce) return FALSE;
if (pdnce->m_cache_nNoHiddenOffline) return TRUE;
return FALSE;
-
}
-static LRESULT clcOnCreate(struct ClcData *dat, HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
+
+static LRESULT clcOnCreate(ClcData *dat, HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
{
- dat = (struct ClcData*)mir_calloc(sizeof(struct ClcData));
+ dat = (ClcData*)mir_calloc(sizeof(ClcData));
SetWindowLongPtr(hwnd,0,(LONG_PTR)dat);
dat->hCheckBoxTheme = xpt_AddThemeHandle(hwnd, L"BUTTON");
dat->m_paintCouter = 0;
@@ -444,12 +440,12 @@ static LRESULT clcOnCreate(struct ClcData *dat, HWND hwnd, UINT msg, WPARAM wPar return 0;
}
-static LRESULT clcOnHitTest(struct ClcData *dat, HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
+static LRESULT clcOnHitTest(ClcData *dat, HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
{
return DefWindowProc(hwnd,WM_NCHITTEST,wParam,lParam);
}
-static LRESULT clcOnCommand(struct ClcData *dat, HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
+static LRESULT clcOnCommand(ClcData *dat, HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
{
ClcContact *contact;
int hit = pcli->pfnGetRowByIndex(dat, dat->selection, &contact, NULL);
@@ -495,7 +491,7 @@ static LRESULT clcOnCommand(struct ClcData *dat, HWND hwnd, UINT msg, WPARAM wPa return 0;
}
-static LRESULT clcOnSize(struct ClcData *dat, HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
+static LRESULT clcOnSize(ClcData *dat, HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
{
pcli->pfnEndRename(hwnd,dat,1);
@@ -548,7 +544,7 @@ static LRESULT clcOnSize(struct ClcData *dat, HWND hwnd, UINT msg, WPARAM wParam return 0;
}
-static LRESULT clcOnChar(struct ClcData *dat, HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
+static LRESULT clcOnChar(ClcData *dat, HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
{
if (wParam == 27 && dat->szQuickSearch[0] == '\0') { //escape and not quick search
// minimize clist
@@ -556,7 +552,7 @@ static LRESULT clcOnChar(struct ClcData *dat, HWND hwnd, UINT msg, WPARAM wParam }
return corecli.pfnContactListControlWndProc(hwnd,msg,wParam,lParam);
}
-static LRESULT clcOnPaint(struct ClcData *dat, HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
+static LRESULT clcOnPaint(ClcData *dat, HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
{
if ( IsWindowVisible(hwnd)) {
if ( !g_CluiData.fLayered || GetParent(hwnd) != pcli->hwndContactList) {
@@ -570,12 +566,12 @@ static LRESULT clcOnPaint(struct ClcData *dat, HWND hwnd, UINT msg, WPARAM wPara return DefWindowProc(hwnd, msg, wParam, lParam);
}
-static LRESULT clcOnEraseBkGround(struct ClcData *dat, HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
+static LRESULT clcOnEraseBkGround(ClcData *dat, HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
{
return 1;
}
-static LRESULT clcOnKeyDown(struct ClcData *dat, HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
+static LRESULT clcOnKeyDown(ClcData *dat, HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
{
int selMoved = 0;
int changeGroupExpand = 0;
@@ -674,7 +670,7 @@ static LRESULT clcOnKeyDown(struct ClcData *dat, HWND hwnd, UINT msg, WPARAM wPa }
else if (changeGroupExpand == 1 && contact->SubExpanded) {
//Contract
- ClcContact * ht = NULL;
+ ClcContact *ht = NULL;
KillTimer(hwnd,TIMERID_SUBEXPAND);
contact->SubExpanded = 0;
db_set_b(contact->hContact,"CList","Expanded",0);
@@ -689,7 +685,7 @@ static LRESULT clcOnKeyDown(struct ClcData *dat, HWND hwnd, UINT msg, WPARAM wPa selMoved = 1;
}
else if (changeGroupExpand == 2 && !contact->SubExpanded && dat->expandMeta) {
- ClcContact * ht = NULL;
+ ClcContact *ht = NULL;
KillTimer(hwnd,TIMERID_SUBEXPAND);
contact->SubExpanded = 1;
db_set_b(contact->hContact,"CList","Expanded",1);
@@ -782,7 +778,7 @@ void clcSetDelayTimer( UINT_PTR uIDEvent, HWND hwnd, int nDelay) CLUI_SafeSetTimer( hwnd, uIDEvent, delay, NULL );
}
-static LRESULT clcOnTimer(struct ClcData *dat, HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
+static LRESULT clcOnTimer(ClcData *dat, HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
{
switch(wParam) {
case TIMERID_INVALIDATE_FULL:
@@ -847,7 +843,7 @@ static LRESULT clcOnTimer(struct ClcData *dat, HWND hwnd, UINT msg, WPARAM wPara }
-static LRESULT clcOnActivate(struct ClcData *dat, HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
+static LRESULT clcOnActivate(ClcData *dat, HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
{
TRACE ("clcOnActivate\n");
if (dat->bCompactMode) {
@@ -858,7 +854,7 @@ static LRESULT clcOnActivate(struct ClcData *dat, HWND hwnd, UINT msg, WPARAM wP dat->dragStage |= DRAGSTAGEF_SKIPRENAME;
return corecli.pfnContactListControlWndProc(hwnd, msg, wParam, lParam);
}
-static LRESULT clcOnSetCursor(struct ClcData *dat, HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
+static LRESULT clcOnSetCursor(ClcData *dat, HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
{
int lResult;
@@ -874,7 +870,7 @@ static LRESULT clcOnSetCursor(struct ClcData *dat, HWND hwnd, UINT msg, WPARAM w lResult = CLUI_TestCursorOnBorders();
return lResult ? lResult : DefWindowProc(hwnd, msg, wParam, lParam);
}
-static LRESULT clcOnLButtonDown(struct ClcData *dat, HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
+static LRESULT clcOnLButtonDown(ClcData *dat, HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
{
{
POINT pt;
@@ -1017,7 +1013,7 @@ static LRESULT clcOnLButtonDown(struct ClcData *dat, HWND hwnd, UINT msg, WPARAM }
}
-static LRESULT clcOnCaptureChanged(struct ClcData *dat, HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
+static LRESULT clcOnCaptureChanged(ClcData *dat, HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
{
if ((HWND)lParam != hwnd) {
if (dat->iHotTrack != -1) {
@@ -1031,7 +1027,7 @@ static LRESULT clcOnCaptureChanged(struct ClcData *dat, HWND hwnd, UINT msg, WPA return 0;
}
-static LRESULT clcOnMouseMove(struct ClcData *dat, HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
+static LRESULT clcOnMouseMove(ClcData *dat, HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
{
BOOL isOutside = FALSE;
if ( CLUI_IsInMainWindow(hwnd)) {
@@ -1251,7 +1247,7 @@ static LRESULT clcOnMouseMove(struct ClcData *dat, HWND hwnd, UINT msg, WPARAM w return 0;
}
-static LRESULT clcOnLButtonUp(struct ClcData *dat, HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
+static LRESULT clcOnLButtonUp(ClcData *dat, HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
{
if (clcExitDragToScroll())
return 0;
@@ -1471,14 +1467,14 @@ static LRESULT clcOnLButtonUp(struct ClcData *dat, HWND hwnd, UINT msg, WPARAM w return 0;
}
-static LRESULT clcOnLButtonDblClick(struct ClcData *dat, HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
+static LRESULT clcOnLButtonDblClick(ClcData *dat, HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
{
KillTimer(hwnd,TIMERID_SUBEXPAND);
hitcontact = NULL;
return corecli.pfnContactListControlWndProc(hwnd, msg, wParam, lParam);
}
-static LRESULT clcOnDestroy(struct ClcData *dat, HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
+static LRESULT clcOnDestroy(ClcData *dat, HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
{
int i=0;
@@ -1510,7 +1506,7 @@ static LRESULT clcOnDestroy(struct ClcData *dat, HWND hwnd, UINT msg, WPARAM wPa return 0;
}
-static LRESULT clcOnIntmGroupChanged(struct ClcData *dat, HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
+static LRESULT clcOnIntmGroupChanged(ClcData *dat, HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
{
ClcContact *contact;
WORD iExtraImage[EXTRA_ICON_COUNT];
@@ -1542,7 +1538,7 @@ static LRESULT clcOnIntmGroupChanged(struct ClcData *dat, HWND hwnd, UINT msg, W return 0;
}
-static LRESULT clcOnIntmIconChanged(struct ClcData *dat, HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
+static LRESULT clcOnIntmIconChanged(ClcData *dat, HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
{
ClcContact *contact = NULL;
ClcGroup *group = NULL;
@@ -1643,7 +1639,7 @@ static LRESULT clcOnIntmIconChanged(struct ClcData *dat, HWND hwnd, UINT msg, WP return 0;
}
-static LRESULT clcOnIntmAvatarChanged(struct ClcData *dat, HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
+static LRESULT clcOnIntmAvatarChanged(ClcData *dat, HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
{
ClcContact *contact;
if ( FindItem(hwnd,dat,(HANDLE)wParam,&contact,NULL,NULL,FALSE))
@@ -1655,7 +1651,7 @@ static LRESULT clcOnIntmAvatarChanged(struct ClcData *dat, HWND hwnd, UINT msg, return 0;
}
-static LRESULT clcOnIntmTimeZoneChanged(struct ClcData *dat, HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
+static LRESULT clcOnIntmTimeZoneChanged(ClcData *dat, HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
{
ClcContact *contact;
if ( !FindItem(hwnd,dat,(HANDLE)wParam,&contact,NULL,NULL,FALSE))
@@ -1669,7 +1665,7 @@ static LRESULT clcOnIntmTimeZoneChanged(struct ClcData *dat, HWND hwnd, UINT msg return 0;
}
-static LRESULT clcOnIntmNameChanged(struct ClcData *dat, HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
+static LRESULT clcOnIntmNameChanged(ClcData *dat, HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
{
ClcContact *contact;
int ret = corecli.pfnContactListControlWndProc(hwnd, msg, wParam, lParam);
@@ -1689,12 +1685,12 @@ static LRESULT clcOnIntmNameChanged(struct ClcData *dat, HWND hwnd, UINT msg, WP return ret;
}
-static LRESULT clcOnIntmApparentModeChanged(struct ClcData *dat, HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
+static LRESULT clcOnIntmApparentModeChanged(ClcData *dat, HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
{
return corecli.pfnContactListControlWndProc(hwnd, msg, wParam, lParam);
}
-static LRESULT clcOnIntmStatusMsgChanged(struct ClcData *dat, HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
+static LRESULT clcOnIntmStatusMsgChanged(ClcData *dat, HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
{
ClcContact *contact;
HANDLE hContact = (HANDLE)wParam;
@@ -1711,7 +1707,7 @@ static LRESULT clcOnIntmStatusMsgChanged(struct ClcData *dat, HWND hwnd, UINT ms return corecli.pfnContactListControlWndProc(hwnd, msg, wParam, lParam);
}
-static LRESULT clcOnIntmNotOnListChanged(struct ClcData *dat, HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
+static LRESULT clcOnIntmNotOnListChanged(ClcData *dat, HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
{
DBCONTACTWRITESETTING *dbcws = (DBCONTACTWRITESETTING*)lParam;
ClcContact *contact;
@@ -1731,7 +1727,7 @@ static LRESULT clcOnIntmNotOnListChanged(struct ClcData *dat, HWND hwnd, UINT ms return corecli.pfnContactListControlWndProc(hwnd, msg, wParam, lParam);
}
-static LRESULT clcOnIntmScrollBarChanged(struct ClcData *dat, HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
+static LRESULT clcOnIntmScrollBarChanged(ClcData *dat, HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
{
if (GetWindowLongPtr(hwnd, GWL_STYLE) & CLS_CONTACTLIST)
{
@@ -1741,11 +1737,11 @@ static LRESULT clcOnIntmScrollBarChanged(struct ClcData *dat, HWND hwnd, UINT ms return 0;
}
-static LRESULT clcOnIntmStatusChanged(struct ClcData *dat, HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
+static LRESULT clcOnIntmStatusChanged(ClcData *dat, HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
{
int ret = corecli.pfnContactListControlWndProc(hwnd, msg, wParam, lParam);
if (wParam != 0) {
- pClcCacheEntry pdnce = (pClcCacheEntry)pcli->pfnGetCacheEntry((HANDLE)wParam);
+ ClcCacheEntry *pdnce = pcli->pfnGetCacheEntry((HANDLE)wParam);
if (pdnce && pdnce->m_cache_cszProto) {
pdnce___SetStatus( pdnce, GetStatusForContact(pdnce->hContact,pdnce->m_cache_cszProto));
if ( !dat->force_in_dialog && (dat->second_line_show || dat->third_line_show))
@@ -1785,7 +1781,7 @@ static LRESULT clcOnIntmStatusChanged(struct ClcData *dat, HWND hwnd, UINT msg, -static LRESULT clcOnIntmReloadOptions(struct ClcData *dat, HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
+static LRESULT clcOnIntmReloadOptions(ClcData *dat, HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
{
corecli.pfnContactListControlWndProc(hwnd, msg, wParam, lParam);
pcli->pfnLoadClcOptions(hwnd,dat);
@@ -1889,7 +1885,7 @@ int ClcDoProtoAck(HANDLE wParam,ACKDATA * ack) }
-int ClcGetShortData(struct ClcData* pData, struct SHORTDATA *pShortData)
+int ClcGetShortData(ClcData* pData, struct SHORTDATA *pShortData)
{
if ( !pData || !pShortData) return -1;
pShortData->hWnd = pData->hWnd;
@@ -1927,9 +1923,9 @@ int ClcGetShortData(struct ClcData* pData, struct SHORTDATA *pShortData) int ClcEnterDragToScroll(HWND hwnd, int Y)
{
- struct ClcData * dat;
+ ClcData *dat;
if (IsDragToScrollMode) return 0;
- dat = (struct ClcData*)GetWindowLongPtr(hwnd,0);
+ dat = (ClcData*)GetWindowLongPtr(hwnd,0);
if ( !dat) return 0;
StartDragPos = Y;
StartScrollPos = dat->yScroll;
@@ -1947,7 +1943,7 @@ LRESULT CALLBACK cli_ContactListControlWndProc(HWND hwnd, UINT msg, WPARAM wPara #define CASE_MSG_RET(msg, handler) case msg: return handler(dat, hwnd, msg, wParam, lParam);
- struct ClcData *dat = (struct ClcData*)GetWindowLongPtr(hwnd,0);
+ ClcData *dat = (ClcData*)GetWindowLongPtr(hwnd,0);
if (msg >= CLM_FIRST && msg < CLM_LAST)
return cli_ProcessExternalMessages(hwnd,dat,msg,wParam,lParam);
diff --git a/plugins/Clist_modern/src/modern_clcidents.cpp b/plugins/Clist_modern/src/modern_clcidents.cpp index 0117b2831a..8397e32f7f 100644 --- a/plugins/Clist_modern/src/modern_clcidents.cpp +++ b/plugins/Clist_modern/src/modern_clcidents.cpp @@ -103,12 +103,12 @@ int cliGetRowsPriorTo(ClcGroup *group,ClcGroup *subgroup,int contactIndex) return -1;
}
-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)
{
return FindItem(hwnd,dat, hItem,contact,subgroup,isVisible,FALSE);
}
-int FindItem(HWND hwnd,struct ClcData *dat,HANDLE hItem,ClcContact **contact,ClcGroup **subgroup,int *isVisible, BOOL isIgnoreSubcontacts)
+int FindItem(HWND hwnd,ClcData *dat,HANDLE hItem,ClcContact **contact,ClcGroup **subgroup,int *isVisible, BOOL isIgnoreSubcontacts)
{
int index = 0, i;
int nowVisible = 1;
@@ -209,7 +209,7 @@ void ClearRowByIndexCache() CacheIndexClear = TRUE;
};
}
-int cliGetRowByIndex(struct ClcData *dat,int testindex,ClcContact **contact,ClcGroup **subgroup)
+int cliGetRowByIndex(ClcData *dat,int testindex,ClcContact **contact,ClcGroup **subgroup)
{
int index = 0,i;
ClcGroup *group = &dat->list;
diff --git a/plugins/Clist_modern/src/modern_clcitems.cpp b/plugins/Clist_modern/src/modern_clcitems.cpp index 898e0d4507..9a27760bea 100644 --- a/plugins/Clist_modern/src/modern_clcitems.cpp +++ b/plugins/Clist_modern/src/modern_clcitems.cpp @@ -29,13 +29,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. void AddSubcontacts(ClcData *dat, ClcContact *cont, BOOL showOfflineHereGroup)
{
- int subcount,i,j;
- HANDLE hsub;
- pClcCacheEntry cacheEntry;
- cacheEntry = (pClcCacheEntry)pcli->pfnGetCacheEntry(cont->hContact);
+ ClcCacheEntry *cacheEntry = pcli->pfnGetCacheEntry(cont->hContact);
cont->SubExpanded = (db_get_b(cont->hContact,"CList","Expanded",0) && (db_get_b(NULL,"CLC","MetaExpanding",SETTING_METAEXPANDING_DEFAULT)));
- subcount = (int)CallService(MS_MC_GETNUMCONTACTS,(WPARAM)cont->hContact,0);
-
+ int subcount = (int)CallService(MS_MC_GETNUMCONTACTS,(WPARAM)cont->hContact,0);
if (subcount <= 0) {
cont->isSubcontact = 0;
cont->subcontacts = NULL;
@@ -47,10 +43,10 @@ void AddSubcontacts(ClcData *dat, ClcContact *cont, BOOL showOfflineHereGroup) mir_free(cont->subcontacts);
cont->subcontacts = (ClcContact *) mir_calloc(sizeof(ClcContact)*subcount);
cont->SubAllocated = subcount;
- i=0;
- for (j = 0; j < subcount; j++) {
- hsub = (HANDLE)CallService(MS_MC_GETSUBCONTACT,(WPARAM)cont->hContact,j);
- cacheEntry = (pClcCacheEntry)pcli->pfnGetCacheEntry(hsub);
+ int i=0;
+ for (int j = 0; j < subcount; j++) {
+ HANDLE hsub = (HANDLE)CallService(MS_MC_GETSUBCONTACT,(WPARAM)cont->hContact,j);
+ cacheEntry = pcli->pfnGetCacheEntry(hsub);
WORD wStatus = pdnce___GetStatus(cacheEntry);
if (showOfflineHereGroup || (!(db_get_b(NULL,"CLC","MetaHideOfflineSub",SETTING_METAHIDEOFFLINESUB_DEFAULT) && db_get_b(NULL,"CList","HideOffline",SETTING_HIDEOFFLINE_DEFAULT))
|| wStatus != ID_STATUS_OFFLINE )) {
@@ -102,7 +98,7 @@ int cli_AddItemToGroup(ClcGroup *group,int iAboveItem) return iAboveItem;
}
-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)
{
ClearRowByIndexCache();
if ( !dat->force_in_dialog && !(GetWindowLongPtr(hwnd, GWL_STYLE) & CLS_SHOWHIDDEN))
@@ -149,9 +145,9 @@ int cli_AddInfoItemToGroup(ClcGroup *group,int flags,const TCHAR *pszText) return i;
}
-static void _LoadDataToContact(ClcContact * cont, ClcGroup *group, struct ClcData *dat, HANDLE hContact)
+static void _LoadDataToContact(ClcContact *cont, ClcGroup *group, ClcData *dat, HANDLE hContact)
{
- pClcCacheEntry cacheEntry = NULL;
+ ClcCacheEntry *cacheEntry = NULL;
WORD apparentMode;
DWORD idleMode;
char * szProto;
@@ -167,7 +163,7 @@ static void _LoadDataToContact(ClcContact * cont, ClcGroup *group, struct ClcDat cont->hContact = hContact;
pcli->pfnInvalidateDisplayNameCacheEntry(hContact);
- cacheEntry = (pClcCacheEntry)pcli->pfnGetCacheEntry(hContact);
+ cacheEntry = pcli->pfnGetCacheEntry(hContact);
szProto = cacheEntry->m_cache_cszProto;
cont->proto = szProto;
@@ -213,7 +209,7 @@ static void _LoadDataToContact(ClcContact * cont, ClcGroup *group, struct ClcDat cont->bContactRate = db_get_b(hContact, "CList", "Rate",0);
}
-static ClcContact * AddContactToGroup(struct ClcData *dat,ClcGroup *group, pClcCacheEntry cacheEntry)
+static ClcContact *AddContactToGroup(ClcData *dat,ClcGroup *group, ClcCacheEntry *cacheEntry)
{
HANDLE hContact;
int i;
@@ -227,12 +223,12 @@ static ClcContact * AddContactToGroup(struct ClcData *dat,ClcGroup *group, pClcC i = cli_AddItemToGroup(group,i+1);
_LoadDataToContact(group->cl.items[i], group, dat, hContact);
- cacheEntry = (pClcCacheEntry)pcli->pfnGetCacheEntry(hContact);
+ cacheEntry = pcli->pfnGetCacheEntry(hContact);
ClearRowByIndexCache();
return group->cl.items[i];
}
-void * AddTempGroup(HWND hwnd,struct ClcData *dat,const TCHAR *szName,DWORD flags,int groupId,int calcTotalMembers)
+void * AddTempGroup(HWND hwnd,ClcData *dat,const TCHAR *szName,DWORD flags,int groupId,int calcTotalMembers)
{
int i=0;
int f = 0;
@@ -263,9 +259,9 @@ void * AddTempGroup(HWND hwnd,struct ClcData *dat,const TCHAR *szName,DWORD flag return NULL;
}
-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)
{
- pClcCacheEntry cacheEntry = (pClcCacheEntry)pcli->pfnGetCacheEntry(hContact);
+ ClcCacheEntry *cacheEntry = pcli->pfnGetCacheEntry(hContact);
if (dat->IsMetaContactsEnabled && cacheEntry && cacheEntry->m_cache_nHiddenSubcontact)
return; //contact should not be added
@@ -283,13 +279,13 @@ void cli_AddContactToTree(HWND hwnd,struct ClcData *dat,HANDLE hContact,int upda void cli_DeleteItemFromTree(HWND hwnd,HANDLE hItem)
{
- ClcData *dat = (struct ClcData *) GetWindowLongPtr(hwnd, 0);
+ ClcData *dat = (ClcData *) GetWindowLongPtr(hwnd, 0);
ClearRowByIndexCache();
corecli.pfnDeleteItemFromTree(hwnd, hItem);
//check here contacts are not resorting
if (hwnd == pcli->hwndContactTree)
- pcli->pfnFreeCacheItem(pcli->pfnGetCacheEntry(hItem));
+ pcli->pfnFreeCacheItem( pcli->pfnGetCacheEntry(hItem));
dat->needsResort = 1;
ClearRowByIndexCache();
}
@@ -304,9 +300,9 @@ __inline BOOL CLCItems_IsShowOfflineGroup(ClcGroup* group) return (groupFlags&GROUPF_SHOWOFFLINE) != 0;
}
-HANDLE SaveSelection( struct ClcData *dat )
+HANDLE SaveSelection( ClcData *dat )
{
- ClcContact * selcontact = NULL;
+ ClcContact *selcontact = NULL;
if ( pcli->pfnGetRowByIndex( dat, dat->selection, &selcontact, NULL ) == -1 )
return NULL;
@@ -314,7 +310,7 @@ HANDLE SaveSelection( struct ClcData *dat ) return pcli->pfnContactToHItem( selcontact );
}
-int RestoreSelection( struct ClcData *dat, HANDLE hSelected )
+int RestoreSelection( ClcData *dat, HANDLE hSelected )
{
ClcContact *selcontact = NULL;
ClcGroup *selgroup = NULL;
@@ -340,11 +336,11 @@ int RestoreSelection( struct ClcData *dat, HANDLE hSelected ) }
-void cliRebuildEntireList(HWND hwnd,struct ClcData *dat)
+void cliRebuildEntireList(HWND hwnd,ClcData *dat)
{
DWORD style = GetWindowLongPtr(hwnd,GWL_STYLE);
HANDLE hContact;
- ClcContact * cont;
+ ClcContact *cont;
ClcGroup *group;
static int rebuildCounter = 0;
@@ -378,42 +374,36 @@ void cliRebuildEntireList(HWND hwnd,struct ClcData *dat) hContact = db_find_first();
while(hContact) {
- pClcCacheEntry cacheEntry = NULL;
+ ClcCacheEntry *cacheEntry = NULL;
cont = NULL;
- cacheEntry = (pClcCacheEntry)pcli->pfnGetCacheEntry(hContact);
+ cacheEntry = pcli->pfnGetCacheEntry(hContact);
int nHiddenStatus = CLVM_GetContactHiddenStatus(hContact, NULL, dat);
- if ((style&CLS_SHOWHIDDEN && nHiddenStatus != -1) || !nHiddenStatus)
- {
-
+ if ((style & CLS_SHOWHIDDEN && nHiddenStatus != -1) || !nHiddenStatus) {
if (lstrlen(cacheEntry->tszGroup) == 0)
group = &dat->list;
- else {
+ else
group = cli_AddGroup(hwnd,dat,cacheEntry->tszGroup,(DWORD)-1,0,0);
- }
- if (group != NULL)
- {
+
+ if (group != NULL) {
WORD wStatus = pdnce___GetStatus( cacheEntry );
if (wStatus == ID_STATUS_OFFLINE)
if (PlaceOfflineToRoot)
group = &dat->list;
group->totalMembers++;
- if ( !(style&CLS_NOHIDEOFFLINE) && (style&CLS_HIDEOFFLINE || group->hideOffline))
- {
+ if ( !(style & CLS_NOHIDEOFFLINE) && (style & CLS_HIDEOFFLINE || group->hideOffline)) {
if (cacheEntry->m_cache_cszProto == NULL) {
if ( !pcli->pfnIsHiddenMode(dat,ID_STATUS_OFFLINE) || cacheEntry->m_cache_nNoHiddenOffline || CLCItems_IsShowOfflineGroup(group))
cont = AddContactToGroup(dat,group,cacheEntry);
}
- else
- if ( !pcli->pfnIsHiddenMode(dat,wStatus) || cacheEntry->m_cache_nNoHiddenOffline || CLCItems_IsShowOfflineGroup(group))
- cont = AddContactToGroup(dat,group,cacheEntry);
+ else if ( !pcli->pfnIsHiddenMode(dat,wStatus) || cacheEntry->m_cache_nNoHiddenOffline || CLCItems_IsShowOfflineGroup(group))
+ cont = AddContactToGroup(dat,group,cacheEntry);
}
else cont = AddContactToGroup(dat,group,cacheEntry);
}
}
- if (cont)
- {
+ if (cont) {
cont->SubAllocated = 0;
if (cont->proto && g_szMetaModuleName && dat->IsMetaContactsEnabled && strcmp(cont->proto,g_szMetaModuleName) == 0)
AddSubcontacts(dat,cont,CLCItems_IsShowOfflineGroup(group));
@@ -421,7 +411,7 @@ void cliRebuildEntireList(HWND hwnd,struct ClcData *dat) hContact = db_find_next(hContact);
}
- if (style&CLS_HIDEEMPTYGROUPS) {
+ if (style & CLS_HIDEEMPTYGROUPS) {
group = &dat->list;
group->scanIndex = 0;
for (;;) {
@@ -448,7 +438,7 @@ void cliRebuildEntireList(HWND hwnd,struct ClcData *dat) RestoreSelection( dat, hSelected );
}
-void cli_SortCLC( HWND hwnd, struct ClcData *dat, int useInsertionSort )
+void cli_SortCLC( HWND hwnd, ClcData *dat, int useInsertionSort )
{
HANDLE hSelected = SaveSelection( dat );
@@ -503,7 +493,7 @@ struct SavedInfoState_t { };
BOOL LOCK_RECALC_SCROLLBAR = FALSE;
-void cli_SaveStateAndRebuildList(HWND hwnd, struct ClcData *dat)
+void cli_SaveStateAndRebuildList(HWND hwnd, ClcData *dat)
{
LOCK_RECALC_SCROLLBAR = TRUE;
@@ -619,7 +609,7 @@ void cli_SaveStateAndRebuildList(HWND hwnd, struct ClcData *dat) }
-WORD pdnce___GetStatus(pClcCacheEntry pdnce)
+WORD pdnce___GetStatus(ClcCacheEntry *pdnce)
{
if ( !pdnce)
return ID_STATUS_OFFLINE;
@@ -627,7 +617,7 @@ WORD pdnce___GetStatus(pClcCacheEntry pdnce) return pdnce->m_cache_nStatus;
}
-void pdnce___SetStatus( pClcCacheEntry pdnce, WORD wStatus )
+void pdnce___SetStatus( ClcCacheEntry *pdnce, WORD wStatus )
{
if (pdnce)
pdnce->m_cache_nStatus = wStatus;
@@ -642,12 +632,12 @@ ClcContact* cliCreateClcContact() ClcCacheEntry* cliCreateCacheItem( HANDLE hContact )
{
- pClcCacheEntry p = (pClcCacheEntry)mir_calloc(sizeof( ClcCacheEntry ));
+ ClcCacheEntry *p = (ClcCacheEntry *)mir_calloc(sizeof( ClcCacheEntry ));
if (p == NULL)
return NULL;
p->hContact = hContact;
- InvalidateDNCEbyPointer(hContact,p,0);
+ InvalidateDNCEbyPointer(hContact, p, 0);
p->szSecondLineText = NULL;
p->szThirdLineText = NULL;
p->ssSecondLine.plText = NULL;
@@ -657,13 +647,13 @@ ClcCacheEntry* cliCreateCacheItem( HANDLE hContact ) void cliInvalidateDisplayNameCacheEntry(HANDLE hContact)
{
- pClcCacheEntry p = pcli->pfnGetCacheEntry(hContact);
+ ClcCacheEntry *p = pcli->pfnGetCacheEntry(hContact);
if (p)
InvalidateDNCEbyPointer(hContact,p,0);
return;
}
-char* cli_GetGroupCountsText(struct ClcData *dat, ClcContact *contact)
+char* cli_GetGroupCountsText(ClcData *dat, ClcContact *contact)
{
return corecli.pfnGetGroupCountsText(dat, contact);
}
@@ -703,7 +693,7 @@ int cliGetGroupContentsCount(ClcGroup *group, int visibleOnly) * also cares about sub contacts (if meta is active)
*/
-int __fastcall CLVM_GetContactHiddenStatus(HANDLE hContact, char *szProto, struct ClcData *dat)
+int __fastcall CLVM_GetContactHiddenStatus(HANDLE hContact, char *szProto, ClcData *dat)
{
int dbHidden = db_get_b(hContact, "CList", "Hidden", 0); // default hidden state, always respect it.
int filterResult = 1;
@@ -712,7 +702,7 @@ int __fastcall CLVM_GetContactHiddenStatus(HANDLE hContact, char *szProto, struc char szTemp[64];
TCHAR szGroupMask[256];
DWORD dwLocalMask;
- PDNCE pdnce = (PDNCE)pcli->pfnGetCacheEntry(hContact);
+ ClcCacheEntry *pdnce = pcli->pfnGetCacheEntry(hContact);
BOOL fEmbedded = dat->force_in_dialog;
// always hide subcontacts (but show them on embedded contact lists)
@@ -760,10 +750,9 @@ int __fastcall CLVM_GetContactHiddenStatus(HANDLE hContact, char *szProto, struc filterResult = (g_CluiData.filterFlags & CLVM_GROUPSTATUS_OP) ? ((filterResult | ((1 << (wStatus - ID_STATUS_OFFLINE)) & g_CluiData.statusMaskFilter ? 1 : 0))) : (filterResult & ((1 << (wStatus - ID_STATUS_OFFLINE)) & g_CluiData.statusMaskFilter ? 1 : 0));
}
if (g_CluiData.bFilterEffective & CLVM_FILTER_LASTMSG) {
- DWORD now;
- PDNCE pdnce = (PDNCE)pcli->pfnGetCacheEntry(hContact);
+ ClcCacheEntry *pdnce = pcli->pfnGetCacheEntry(hContact);
if (pdnce) {
- now = g_CluiData.t_now;
+ DWORD now = g_CluiData.t_now;
now -= g_CluiData.lastMsgFilter;
if (g_CluiData.bFilterEffective & CLVM_FILTER_LASTMSG_OLDERTHAN)
filterResult = filterResult & (pdnce->dwLastMsgTime < now);
@@ -773,6 +762,6 @@ int __fastcall CLVM_GetContactHiddenStatus(HANDLE hContact, char *szProto, struc }
return (dbHidden | !filterResult | searchResult);
}
- else
- return dbHidden | searchResult;
+
+ return dbHidden | searchResult;
}
diff --git a/plugins/Clist_modern/src/modern_clcmsgs.cpp b/plugins/Clist_modern/src/modern_clcmsgs.cpp index 0750060243..2d6ffc924c 100644 --- a/plugins/Clist_modern/src/modern_clcmsgs.cpp +++ b/plugins/Clist_modern/src/modern_clcmsgs.cpp @@ -28,7 +28,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. //processing of all the CLM_ messages incoming
-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)
{
ClcContact *contact;
ClcGroup *group;
diff --git a/plugins/Clist_modern/src/modern_clcpaint.cpp b/plugins/Clist_modern/src/modern_clcpaint.cpp index f9623affa8..90b1512d21 100644 --- a/plugins/Clist_modern/src/modern_clcpaint.cpp +++ b/plugins/Clist_modern/src/modern_clcpaint.cpp @@ -109,7 +109,7 @@ CLCPaint::CLCPaint() _FillQuickHash();
};
-void CLCPaint::cliPaintClc( HWND hwnd, struct ClcData *dat, HDC hdc, RECT *rcPaint )
+void CLCPaint::cliPaintClc( HWND hwnd, ClcData *dat, HDC hdc, RECT *rcPaint )
{
if ( MirandaExiting()) return;
g_CluiData.mutexPaintLock++;
@@ -128,12 +128,12 @@ BOOL CLCPaint::IsForegroundWindow( HWND hWnd ) return FALSE;
}
-HFONT CLCPaint::ChangeToFont( HDC hdc, struct ClcData *dat, int id, int *fontHeight )
+HFONT CLCPaint::ChangeToFont( HDC hdc, ClcData *dat, int id, int *fontHeight )
{
- if ( !dat )
- dat = ( struct ClcData* )GetWindowLongPtr( pcli->hwndContactTree, 0 );
+ if ( !dat)
+ dat = (ClcData*)GetWindowLongPtr( pcli->hwndContactTree, 0 );
- if ( !dat )
+ if ( !dat)
return NULL;
HFONT res = ( HFONT )SelectObject( hdc, dat->fontModernInfo[id].hFont );
@@ -151,33 +151,26 @@ HFONT CLCPaint::ChangeToFont( HDC hdc, struct ClcData *dat, int id, int *fontHei return res;
}
-int CLCPaint::GetBasicFontID( ClcContact * contact )
+int CLCPaint::GetBasicFontID(ClcContact *contact)
{
- PDNCE pdnce = NULL;
- if ( contact->type == CLCIT_CONTACT )
- pdnce = ( PDNCE )pcli->pfnGetCacheEntry( contact->hContact );
+ ClcCacheEntry *pdnce = NULL;
+ if (contact->type == CLCIT_CONTACT)
+ pdnce = pcli->pfnGetCacheEntry(contact->hContact);
- switch ( contact->type )
- {
+ switch (contact->type) {
case CLCIT_GROUP:
- if ( contact->group->expanded )
- return FONTID_OPENGROUPS;
- else
- return FONTID_CLOSEDGROUPS;
- break;
+ return ( contact->group->expanded ) ? FONTID_OPENGROUPS : FONTID_CLOSEDGROUPS;
+
case CLCIT_INFO:
- if ( contact->flags & CLCIIF_GROUPFONT )
- return FONTID_OPENGROUPS;
- else
- return FONTID_CONTACTS;
- break;
+ return ( contact->flags & CLCIIF_GROUPFONT ) ? FONTID_OPENGROUPS : FONTID_CONTACTS;
+
case CLCIT_DIVIDER:
return FONTID_DIVIDERS;
- break;
+
case CLCIT_CONTACT:
if ( contact->flags & CONTACTF_NOTONLIST )
return FONTID_NOTONLIST;
- else if (( contact->flags&CONTACTF_INVISTO
+ if (( contact->flags&CONTACTF_INVISTO
&& _GetRealStatus( contact, ID_STATUS_OFFLINE ) != ID_STATUS_INVISIBLE )
||
( contact->flags&CONTACTF_VISTO
@@ -187,10 +180,8 @@ int CLCPaint::GetBasicFontID( ClcContact * contact ) // the contact is in the always invisible and the proto is in any other mode
return contact->flags & CONTACTF_ONLINE ? FONTID_INVIS : FONTID_OFFINVIS;
}
- else
- {
- switch( pdnce___GetStatus( pdnce ))
- {
+
+ switch( pdnce___GetStatus( pdnce )) {
case ID_STATUS_OFFLINE: return FONTID_OFFLINE;
case ID_STATUS_AWAY: return FONTID_AWAY;
case ID_STATUS_DND: return FONTID_DND;
@@ -200,10 +191,8 @@ int CLCPaint::GetBasicFontID( ClcContact * contact ) case ID_STATUS_INVISIBLE: return FONTID_INVISIBLE;
case ID_STATUS_ONTHEPHONE: return FONTID_PHONE;
case ID_STATUS_OUTTOLUNCH: return FONTID_LUNCH;
- default: return FONTID_CONTACTS;
- }
}
- break;
+
default:
return FONTID_CONTACTS;
}
@@ -211,13 +200,11 @@ int CLCPaint::GetBasicFontID( ClcContact * contact ) void CLCPaint::GetTextSize( SIZE *text_size, HDC hdcMem, RECT free_row_rc, TCHAR *szText, SortedList *plText, UINT uTextFormat, int smiley_height )
{
- if ( szText == NULL || !szText[0] )
- {
+ if ( szText == NULL || !szText[0] ) {
text_size->cy = 0;
text_size->cx = 0;
}
- else
- {
+ else {
RECT text_rc = free_row_rc;
int free_width;
int free_height;
@@ -229,11 +216,8 @@ void CLCPaint::GetTextSize( SIZE *text_size, HDC hdcMem, RECT free_row_rc, TCHA text_size->cy = ske_DrawText( hdcMem, szText, lstrlen( szText ), &text_rc, DT_CALCRECT | uTextFormat );
text_size->cy = min( text_size->cy, free_height );
if ( plText == NULL )
- {
text_size->cx = min( text_rc.right - text_rc.left + 2, free_width );
- }
- else
- {
+ else {
// See each item of list
int i;
@@ -241,29 +225,22 @@ void CLCPaint::GetTextSize( SIZE *text_size, HDC hdcMem, RECT free_row_rc, TCHA text_size->cx = 0;
- for ( i=0; i < plText->realCount && text_size->cx < free_width; i++ )
- {
+ for ( i=0; i < plText->realCount && text_size->cx < free_width; i++ ) {
ClcContactTextPiece *piece = ( ClcContactTextPiece * ) plText->items[i];
- if ( piece->type == TEXT_PIECE_TYPE_TEXT )
- {
+ if ( piece->type == TEXT_PIECE_TYPE_TEXT ) {
text_rc = free_row_rc;
ske_DrawText( hdcMem, &szText[piece->start_pos], piece->len, &text_rc, DT_CALCRECT | uTextFormat );
text_size->cx = min( text_size->cx + text_rc.right - text_rc.left + 2, free_width );
}
- else
- {
+ else {
double factor;
if ( piece->smiley_height > text_size->cy )
- {
factor = text_size->cy / ( double ) piece->smiley_height;
- }
else
- {
factor = 1;
- }
text_size->cx = min( text_size->cx + ( long )( factor * piece->smiley_width ), free_width );
}
@@ -272,13 +249,14 @@ void CLCPaint::GetTextSize( SIZE *text_size, HDC hdcMem, RECT free_row_rc, TCHA }
}
-void CLCPaint::AddParam( MODERNMASK * mpModernMask, DWORD dwParamHash, const char* const szValue, DWORD dwValueHash )
+void CLCPaint::AddParam( MODERNMASK *mpModernMask, DWORD dwParamHash, const char* const szValue, DWORD dwValueHash )
{
static MASKPARAM param = {0}; //AddParameter will clear it so it can be static to avoid initializations
_FillParam( ¶m, dwParamHash, szValue, dwValueHash );
_AddParameter( mpModernMask, ¶m );
}
-BOOL CLCPaint::CheckMiniMode( struct ClcData *dat, BOOL selected, BOOL hot )
+
+BOOL CLCPaint::CheckMiniMode( ClcData *dat, BOOL selected, BOOL hot )
{
if (( !dat->bCompactMode /* not mini*/ )
|| (( dat->bCompactMode&0x01 ) && selected /*mini on selected*/ )
@@ -286,9 +264,9 @@ BOOL CLCPaint::CheckMiniMode( struct ClcData *dat, BOOL selected, BOOL hot ) return TRUE;
}
-tPaintCallbackProc CLCPaint::PaintCallbackProc( HWND hWnd, HDC hDC, RECT * rcPaint, HRGN rgn, DWORD dFlags, void * CallBackData )
+tPaintCallbackProc CLCPaint::PaintCallbackProc( HWND hWnd, HDC hDC, RECT *rcPaint, HRGN rgn, DWORD dFlags, void * CallBackData )
{
- struct ClcData* dat = ( struct ClcData* )GetWindowLongPtr( hWnd, 0 );
+ ClcData* dat = ( ClcData* )GetWindowLongPtr( hWnd, 0 );
if ( !dat ) return 0;
cliPaintClc( hWnd, dat, hDC, rcPaint );
return NULL;
@@ -301,7 +279,7 @@ void CLCPaint::_FillQuickHash() HASH[i] = mod_CalcHash( HASHTEXT[i] );
}
-void CLCPaint::_SetHotTrackColour( HDC hdc, struct ClcData *dat )
+void CLCPaint::_SetHotTrackColour( HDC hdc, ClcData *dat )
{
if ( dat->gammaCorrection ) {
COLORREF oldCol, newCol;
@@ -388,7 +366,7 @@ int CLCPaint::_GetGeneralisedStatus() return status;
}
-int CLCPaint::_GetRealStatus( ClcContact * pContact, int nStatus )
+int CLCPaint::_GetRealStatus( ClcContact *pContact, int nStatus )
{
if ( !pContact->proto )
return nStatus;
@@ -402,7 +380,7 @@ int CLCPaint::_GetRealStatus( ClcContact * pContact, int nStatus ) }
-RECT CLCPaint::_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 )
+RECT CLCPaint::_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 )
{
RECT rc = *free_row_rc;
int width_tmp = width;
@@ -444,7 +422,7 @@ RECT CLCPaint::_GetRectangle( struct ClcData *dat, RECT *row_rc, RECT *free_row -void CLCPaint::_DrawTextSmiley( HDC hdcMem, RECT * free_rc, SIZE * text_size, TCHAR *szText, int start, int len, SortedList *plText, UINT uTextFormat, BOOL ResizeSizeSmiley )
+void CLCPaint::_DrawTextSmiley( HDC hdcMem, RECT *free_rc, SIZE * text_size, TCHAR *szText, int start, int len, SortedList *plText, UINT uTextFormat, BOOL ResizeSizeSmiley )
{
if ( szText == NULL )return;
uTextFormat &= ~DT_RIGHT;
@@ -553,7 +531,7 @@ void CLCPaint::_DrawTextSmiley( HDC hdcMem, RECT * free_rc, SIZE * text_size, T }
-void CLCPaint::_AddParameter( MODERNMASK * mpModernMask, MASKPARAM * lpParam )
+void CLCPaint::_AddParameter( MODERNMASK *mpModernMask, MASKPARAM * lpParam )
{
mpModernMask->pl_Params = ( MASKPARAM * )realloc( mpModernMask->pl_Params, ( mpModernMask->dwParamCnt+1 )*sizeof( MASKPARAM ));
memmove( &( mpModernMask->pl_Params[mpModernMask->dwParamCnt] ), lpParam, sizeof( MASKPARAM ));
@@ -571,15 +549,15 @@ void CLCPaint::_FillParam( MASKPARAM * lpParam, DWORD dwParamHash, const char* else lpParam->szValue = NULL;
}
-void CLCPaint::_AddParamShort( MODERNMASK * mpModernMask, DWORD dwParamIndex, DWORD dwValueIndex )
+void CLCPaint::_AddParamShort( MODERNMASK *mpModernMask, DWORD dwParamIndex, DWORD dwValueIndex )
{
AddParam( mpModernMask, HASH[dwParamIndex], HASHTEXT[dwValueIndex], HASH[dwValueIndex] );
}
-MODERNMASK * CLCPaint::_GetCLCContactRowBackModernMask( ClcGroup * group, ClcContact * Drawing, int indent, int index, BOOL selected, BOOL hottrack, struct ClcData * dat )
+MODERNMASK *CLCPaint::_GetCLCContactRowBackModernMask( ClcGroup *group, ClcContact *Drawing, int indent, int index, BOOL selected, BOOL hottrack, ClcData *dat )
{
- MODERNMASK * mpModernMask = NULL;
+ MODERNMASK *mpModernMask = NULL;
char buf[BUF2SIZE] = {0};
mpModernMask = ( MODERNMASK* )mir_calloc( sizeof( MODERNMASK ));
@@ -596,7 +574,7 @@ MODERNMASK * CLCPaint::_GetCLCContactRowBackModernMask( ClcGroup * group, ClcCon break;
case CLCIT_CONTACT:
{
- ClcContact * mCont = Drawing;
+ ClcContact *mCont = Drawing;
if ( Drawing->isSubcontact )
{
_AddParamShort( mpModernMask, hi_Type, hi_SubContact );
@@ -710,7 +688,7 @@ void CLCPaint::_RTLRect( RECT *rect, int width, int offset ) return;
}
-void CLCPaint::_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 CLCPaint::_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 )
{
int i=0;
int dx = free_row_rc.left;
@@ -723,13 +701,13 @@ void CLCPaint::_PaintRowItemsEx( HWND hwnd, HDC hdcMem, struct ClcData *dat, Clc int mode2 = -1;
COLORREF colourFg = RGB( 0, 0, 0 );
BOOL InClistWindow = ( dat->hWnd == pcli->hwndContactTree );
- PDNCE pdnce = NULL;
+ ClcCacheEntry *pdnce = NULL;
int height = RowHeight_CalcRowHeight( dat, hwnd, Drawing, -1 );
// TO DO DEPRECATE OLD ROW LAYOUT
if ( Drawing->type == CLCIT_CONTACT )
- pdnce = ( PDNCE )pcli->pfnGetCacheEntry( Drawing->hContact );
+ pdnce = pcli->pfnGetCacheEntry( Drawing->hContact );
if ( Drawing->type == CLCIT_GROUP &&
Drawing->group->parent->groupId == 0 &&
@@ -1676,7 +1654,7 @@ void CLCPaint::_PaintRowItemsEx( HWND hwnd, HDC hdcMem, struct ClcData *dat, Clc -void CLCPaint::_DrawStatusIcon( ClcContact * Drawing, struct ClcData *dat, int iImage, HDC hdcMem, int x, int y, int cx, int cy, DWORD colorbg, DWORD colorfg, int mode )
+void CLCPaint::_DrawStatusIcon( ClcContact *Drawing, ClcData *dat, int iImage, HDC hdcMem, int x, int y, int cx, int cy, DWORD colorbg, DWORD colorfg, int mode )
{
if ( Drawing->type != CLCIT_CONTACT )
{
@@ -1706,7 +1684,7 @@ void CLCPaint::_DrawStatusIcon( ClcContact * Drawing, struct ClcData *dat, int i }
}
-BOOL CLCPaint::_DrawNonEnginedBackground( HWND hwnd, HDC hdcMem, RECT * rcPaint, RECT clRect, struct ClcData * dat )
+BOOL CLCPaint::_DrawNonEnginedBackground( HWND hwnd, HDC hdcMem, RECT *rcPaint, RECT clRect, ClcData *dat )
{
if ( dat->hBmpBackground )
{
@@ -1790,7 +1768,7 @@ BOOL CLCPaint::_DrawNonEnginedBackground( HWND hwnd, HDC hdcMem, RECT * rcPaint, return FALSE;
}
-int CLCPaint::_DetermineDrawMode( HWND hWnd, struct ClcData *dat )
+int CLCPaint::_DetermineDrawMode( HWND hWnd, ClcData *dat )
{
int paintMode = DM_LAYERED; // by default
@@ -1817,7 +1795,7 @@ int CLCPaint::_DetermineDrawMode( HWND hWnd, struct ClcData *dat ) return paintMode;
}
-void CLCPaint::_PreparePaintContext( HWND hWnd, struct ClcData * dat, HDC hdc, int paintMode, RECT& clRect, _PaintContext& pc )
+void CLCPaint::_PreparePaintContext( HWND hWnd, ClcData *dat, HDC hdc, int paintMode, RECT& clRect, _PaintContext& pc )
{
if ( paintMode&DM_GRAY && !(paintMode&DM_LAYERED))
{
@@ -1874,7 +1852,7 @@ void CLCPaint::_PreparePaintContext( HWND hWnd, struct ClcData * dat, HDC hdc, i SetBrushOrgEx( pc.hdcMem, org.x, org.y, NULL );
}
-void CLCPaint::_DrawBackground( HWND hWnd, struct ClcData * dat, HDC hdc, int paintMode, RECT * rcPaint, RECT& clRect, _PaintContext& pc )
+void CLCPaint::_DrawBackground( HWND hWnd, ClcData *dat, HDC hdc, int paintMode, RECT *rcPaint, RECT& clRect, _PaintContext& pc )
{
if (paintMode & (DM_FLOAT | DM_CONTROL)) {
HBRUSH hBrush = CreateSolidBrush( pc.tmpbkcolour );
@@ -1899,7 +1877,7 @@ void CLCPaint::_DrawBackground( HWND hWnd, struct ClcData * dat, HDC hdc, int pa }
}
-void CLCPaint::_DrawLines( HWND hWnd, struct ClcData * dat, HDC hdc, int paintMode, RECT* rcPaint, RECT& clRect, _PaintContext& pc )
+void CLCPaint::_DrawLines( HWND hWnd, ClcData *dat, HDC hdc, int paintMode, RECT* rcPaint, RECT& clRect, _PaintContext& pc )
{
ClcContact *Drawing;
ClcGroup *group = &dat->list;
@@ -1938,7 +1916,7 @@ void CLCPaint::_DrawLines( HWND hWnd, struct ClcData * dat, HDC hdc, int paintMo int free_row_height;
RECT row_rc;
RECT free_row_rc;
- MODERNMASK * mpRequest = NULL;
+ MODERNMASK *mpRequest = NULL;
RECT rc;
// Get item to draw
@@ -2173,7 +2151,7 @@ void CLCPaint::_DrawLines( HWND hWnd, struct ClcData * dat, HDC hdc, int paintMo }
-void CLCPaint::_DrawInsertionMark( struct ClcData * dat, RECT& clRect, _PaintContext& pc )
+void CLCPaint::_DrawInsertionMark( ClcData *dat, RECT& clRect, _PaintContext& pc )
{
HBRUSH hBrush, hoBrush;
POINT pts[8];
@@ -2207,7 +2185,7 @@ void CLCPaint::_DrawInsertionMark( struct ClcData * dat, RECT& clRect, _PaintCon DeleteObject( hBrush );
}
-void CLCPaint::_CopyPaintToDest( HWND hWnd, struct ClcData * dat, HDC hdc, int paintMode, RECT* rcPaint, RECT& clRect, _PaintContext& pc )
+void CLCPaint::_CopyPaintToDest( HWND hWnd, ClcData *dat, HDC hdc, int paintMode, RECT* rcPaint, RECT& clRect, _PaintContext& pc )
{
if ( !( paintMode&DM_GRAY ) && ( paintMode & DM_DRAW_OFFSCREEN ))
{
@@ -2240,7 +2218,7 @@ void CLCPaint::_FreePaintContext( _PaintContext& pc ) DeleteDC( pc.hdcMem2 );
}
}
-void CLCPaint::_PaintClc( HWND hwnd, struct ClcData *dat, HDC hdc, RECT *_rcPaint )
+void CLCPaint::_PaintClc( HWND hwnd, ClcData *dat, HDC hdc, RECT *_rcPaint )
{
g_CluiData.t_now = time( NULL );
@@ -2250,7 +2228,7 @@ void CLCPaint::_PaintClc( HWND hwnd, struct ClcData *dat, HDC hdc, RECT *_rcPain RECT clRect;
GetClientRect( hwnd, &clRect );
- RECT * rcPaint = _rcPaint ? _rcPaint : &clRect; // if null is transmitted - use whole client area
+ RECT *rcPaint = _rcPaint ? _rcPaint : &clRect; // if null is transmitted - use whole client area
// Invalidate ani avatars, avatars have to be validated in row paint routine below
if ( rcPaint->top == 0 && rcPaint->bottom == clRect.bottom && dat->avatars_show )
@@ -2284,7 +2262,7 @@ void CLCPaint::_PaintClc( HWND hwnd, struct ClcData *dat, HDC hdc, RECT *_rcPain }
-void CLCPaint::_StoreItemPos( ClcContact *contact, int ItemType, RECT * rc )
+void CLCPaint::_StoreItemPos( ClcContact *contact, int ItemType, RECT *rc )
{
contact->ext_mpItemsDesc[contact->ext_nItemsNum].itemType = ItemType;
contact->ext_mpItemsDesc[contact->ext_nItemsNum].itemRect = *rc;
@@ -2317,7 +2295,7 @@ void CLCPaint::_StoreItemPos( ClcContact *contact, int ItemType, RECT * rc ) }
-void CLCPaint::_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 )
+void CLCPaint::_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 )
{
int item_iterator, item, item_text, text_left_pos;
BOOL left = TRUE; //TODO remove
@@ -2487,7 +2465,7 @@ void CLCPaint::_CalcItemsPos( HWND hwnd, HDC hdcMem, struct ClcData *dat, ClcCon }
case ITEM_CONTACT_TIME: /////////////////////////////////////////////////////////////////////////////////////////////////////
{
- PDNCE pdnce = ( PDNCE )(( Drawing->type == CLCIT_CONTACT )?pcli->pfnGetCacheEntry( Drawing->hContact ):NULL );
+ ClcCacheEntry *pdnce = (Drawing->type == CLCIT_CONTACT) ? pcli->pfnGetCacheEntry(Drawing->hContact) : NULL;
if ( Drawing->type == CLCIT_CONTACT && dat->contact_time_show && pdnce->hTimeZone )
{
TCHAR szResult[80];
@@ -2690,7 +2668,7 @@ void CLCPaint::_CalcItemsPos( HWND hwnd, HDC hdcMem, struct ClcData *dat, ClcCon else if ( Drawing->type == CLCIT_CONTACT && !CheckMiniMode( dat, selected, hottrack ))
{
int tmp;
- PDNCE pdnce = ( PDNCE )(( Drawing->type == CLCIT_CONTACT )?pcli->pfnGetCacheEntry( Drawing->hContact ):NULL );
+ ClcCacheEntry *pdnce = (Drawing->type == CLCIT_CONTACT) ? pcli->pfnGetCacheEntry(Drawing->hContact) : NULL;
if ( dat->second_line_show && dat->second_line_type == TEXT_CONTACT_TIME && pdnce->hTimeZone)
{
// Get contact time
@@ -2855,7 +2833,7 @@ void CLCPaint::_CalcItemsPos( HWND hwnd, HDC hdcMem, struct ClcData *dat, ClcCon {
RECT free_rc = text_rc;
- PDNCE pdnce = ( PDNCE )pcli->pfnGetCacheEntry( Drawing->hContact );
+ ClcCacheEntry *pdnce = pcli->pfnGetCacheEntry( Drawing->hContact );
if ( text_size.cx > 0 && free_rc.bottom > free_rc.top )
{
RECT rc = free_rc;
@@ -2928,7 +2906,7 @@ void CLCPaint::_CalcItemsPos( HWND hwnd, HDC hdcMem, struct ClcData *dat, ClcCon *in_row_rc = row_rc;
Drawing->ext_fItemsValid = FALSE; /*TO DO: correctly implement placement recalculation*/
}
-BOOL CLCPaint::__IsVisible( RECT * firtRect, RECT * secondRect )
+BOOL CLCPaint::__IsVisible( RECT *firtRect, RECT *secondRect )
{
RECT res;
IntersectRect( &res, firtRect, secondRect );
@@ -2936,7 +2914,7 @@ BOOL CLCPaint::__IsVisible( RECT * firtRect, RECT * secondRect ) }
-void CLCPaint::_GetBlendMode( IN struct ClcData *dat, IN ClcContact * Drawing, IN BOOL selected, IN BOOL hottrack, IN BOOL bFlag, OUT COLORREF * OutColourFg, OUT int * OutMode )
+void CLCPaint::_GetBlendMode( IN ClcData *dat, IN ClcContact *Drawing, IN BOOL selected, IN BOOL hottrack, IN BOOL bFlag, OUT COLORREF * OutColourFg, OUT int * OutMode )
{
COLORREF colourFg;
int mode;
@@ -2978,7 +2956,7 @@ void CLCPaint::_GetBlendMode( IN struct ClcData *dat, IN ClcContact * Drawing, I }
}
-void CLCPaint::_DrawContactAvatar( HDC hdcMem, struct ClcData *dat, ClcContact *Drawing, RECT *row_rc, int& selected, int& hottrack, RECT& text_rc, RECT * prcItem )
+void CLCPaint::_DrawContactAvatar( HDC hdcMem, ClcData *dat, ClcContact *Drawing, RECT *row_rc, int& selected, int& hottrack, RECT& text_rc, RECT *prcItem )
{
if ( Drawing->avatar_pos == AVATAR_POS_ANIMATED )
{
@@ -3101,7 +3079,7 @@ void CLCPaint::_DrawContactAvatar( HDC hdcMem, struct ClcData *dat, ClcContact * }
}
-void CLCPaint::_DrawContactIcon( HDC hdcMem, struct ClcData *dat, ClcContact *Drawing, int& selected, int& hottrack, RECT& text_rc, RECT * prcItem )
+void CLCPaint::_DrawContactIcon( HDC hdcMem, ClcData *dat, ClcContact *Drawing, int& selected, int& hottrack, RECT& text_rc, RECT *prcItem )
{
//Draw Icon
int iImage = -1;
@@ -3126,7 +3104,7 @@ void CLCPaint::_DrawContactIcon( HDC hdcMem, struct ClcData *dat, ClcContact *Dr }
}
-void CLCPaint::_DrawContactText( HDC hdcMem, struct ClcData *dat, ClcContact *Drawing, int& selected, int& hottrack, RECT& text_rc, RECT * prcItem, UINT uTextFormat )
+void CLCPaint::_DrawContactText( HDC hdcMem, ClcData *dat, ClcContact *Drawing, int& selected, int& hottrack, RECT& text_rc, RECT *prcItem, UINT uTextFormat )
{
ChangeToFont( hdcMem, dat, GetBasicFontID( Drawing ), NULL );
if ( selected )
@@ -3171,7 +3149,7 @@ void CLCPaint::_DrawContactText( HDC hdcMem, struct ClcData *dat, ClcContact *Dr text_rc.right = max( text_rc.right, prcItem->right );
text_rc.left = min( text_rc.left, prcItem->left );
}
-void CLCPaint::_DrawContactSubText( HDC hdcMem, struct ClcData *dat, ClcContact *Drawing, int& selected, int& hottrack, RECT& text_rc, RECT * prcItem, UINT uTextFormat, BYTE itemType )
+void CLCPaint::_DrawContactSubText( HDC hdcMem, ClcData *dat, ClcContact *Drawing, int& selected, int& hottrack, RECT& text_rc, RECT *prcItem, UINT uTextFormat, BYTE itemType )
{
if ( Drawing->type == CLCIT_GROUP )
{
@@ -3192,9 +3170,8 @@ void CLCPaint::_DrawContactSubText( HDC hdcMem, struct ClcData *dat, ClcContact else if ( Drawing->type == CLCIT_CONTACT )
{
SIZE text_size = { _rcWidth( prcItem ), _rcHeight( prcItem ) };
- PDNCE pdnce = ( PDNCE )(( Drawing->type == CLCIT_CONTACT )?pcli->pfnGetCacheEntry( Drawing->hContact ):NULL );
- if ( pdnce )
- {
+ ClcCacheEntry *pdnce = (Drawing->type == CLCIT_CONTACT) ? pcli->pfnGetCacheEntry(Drawing->hContact) : NULL;
+ if ( pdnce ) {
ChangeToFont( hdcMem, dat, itemType == CIT_SUBTEXT1 ? FONTID_SECONDLINE : FONTID_THIRDLINE, NULL );
//draw second and third line
if ( selected )
@@ -3211,22 +3188,22 @@ void CLCPaint::_DrawContactSubText( HDC hdcMem, struct ClcData *dat, ClcContact text_rc.right = max( text_rc.right, prcItem->right );
text_rc.left = min( text_rc.left, prcItem->left );
}
-void CLCPaint::_DrawContactTime( HDC hdcMem, struct ClcData *dat, ClcContact *Drawing, int& selected, int& hottrack, RECT& text_rc, RECT * prcItem )
+
+void CLCPaint::_DrawContactTime( HDC hdcMem, ClcData *dat, ClcContact *Drawing, int& selected, int& hottrack, RECT& text_rc, RECT *prcItem )
{
TCHAR szResult[80];
- PDNCE pdnce = ( PDNCE )(( Drawing->type == CLCIT_CONTACT )?pcli->pfnGetCacheEntry( Drawing->hContact ):NULL );
-
- if ( !pdnce ) return;
+ ClcCacheEntry *pdnce = (Drawing->type == CLCIT_CONTACT) ? pcli->pfnGetCacheEntry(Drawing->hContact) : NULL;
+ if ( !pdnce )
+ return;
- if ( !tmi.printDateTime(pdnce->hTimeZone, _T("t"), szResult, SIZEOF(szResult), 0))
- {
+ if ( !tmi.printDateTime(pdnce->hTimeZone, _T("t"), szResult, SIZEOF(szResult), 0)) {
// Select font
ChangeToFont( hdcMem, dat, FONTID_CONTACT_TIME, NULL );
ske_DrawText( hdcMem, szResult, lstrlen( szResult ), prcItem, DT_NOPREFIX | DT_SINGLELINE );
}
}
-void CLCPaint::_DrawContactSelection( HDC hdcMem, struct ClcData *dat, ClcContact *Drawing, int& selected, int& hottrack, RECT *rcPaint, RECT * prcItem )
+void CLCPaint::_DrawContactSelection( HDC hdcMem, ClcData *dat, ClcContact *Drawing, int& selected, int& hottrack, RECT *rcPaint, RECT *prcItem )
{
// Selection background
if (( selected || hottrack ) && dat->HiLightMode == 0) {
@@ -3237,7 +3214,7 @@ void CLCPaint::_DrawContactSelection( HDC hdcMem, struct ClcData *dat, ClcContac }
}
-void CLCPaint::_DrawContactExtraIcon( HDC hdcMem, struct ClcData *dat, ClcContact *Drawing, int& selected, int& hottrack, RECT& text_rc, RECT * rc, int iImage )
+void CLCPaint::_DrawContactExtraIcon( HDC hdcMem, ClcData *dat, ClcContact *Drawing, int& selected, int& hottrack, RECT& text_rc, RECT *rc, int iImage )
{
//Draw extra icon
if ( iImage != -1 ) {
@@ -3250,7 +3227,7 @@ void CLCPaint::_DrawContactExtraIcon( HDC hdcMem, struct ClcData *dat, ClcContac }
}
-void CLCPaint::_DrawContactLine( HDC hdcMem, struct ClcData *dat, ClcContact *Drawing, RECT *free_row_rc, RECT *rcPaint, RECT& text_rc )
+void CLCPaint::_DrawContactLine( HDC hdcMem, ClcData *dat, ClcContact *Drawing, RECT *free_row_rc, RECT *rcPaint, RECT& text_rc )
{ //draw line
RECT rc1 = *free_row_rc;
RECT rc2 = *free_row_rc;
@@ -3289,7 +3266,7 @@ void CLCPaint::_DrawContactLine( HDC hdcMem, struct ClcData *dat, ClcContact *Dr }
}
-void CLCPaint::_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 CLCPaint::_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 )
{
int i;
RECT text_rc = {0};
@@ -3308,7 +3285,7 @@ void CLCPaint::_DrawContactItems( HWND hwnd, HDC hdcMem, struct ClcData *dat, Cl for ( i=0; i < Drawing->ext_nItemsNum; i++ )
{
- RECT * prcItem = &( Drawing->ext_mpItemsDesc[i].itemRect );
+ RECT *prcItem = &( Drawing->ext_mpItemsDesc[i].itemRect );
if ( __IsVisible( rcPaint, prcItem ) || ( Drawing->ext_mpItemsDesc[i].itemType == CIT_AVATAR && Drawing->avatar_pos == AVATAR_POS_ANIMATED ))
{
switch( Drawing->ext_mpItemsDesc[i].itemType )
@@ -3347,7 +3324,7 @@ void CLCPaint::_DrawContactItems( HWND hwnd, HDC hdcMem, struct ClcData *dat, Cl || ( Drawing->type == CLCIT_DIVIDER ))
_DrawContactLine( hdcMem, dat, Drawing, free_row_rc, rcPaint, text_rc );
}
-void CLCPaint::_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 CLCPaint::_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 )
{
//Extended LAYOUT
if ( gl_RowRoot && ( dat->hWnd == pcli->hwndContactTree ))
diff --git a/plugins/Clist_modern/src/modern_clcutils.cpp b/plugins/Clist_modern/src/modern_clcutils.cpp index 9ab5f86298..859b9fc3f6 100644 --- a/plugins/Clist_modern/src/modern_clcutils.cpp +++ b/plugins/Clist_modern/src/modern_clcutils.cpp @@ -33,7 +33,7 @@ BOOL RectHitTest(RECT *rc, int testx, int testy) return testx >= rc->left && testx < rc->right && testy >= rc->top && testy < rc->bottom;
}
-int cliHitTest(HWND hwnd,struct ClcData *dat,int testx,int testy,ClcContact **contact,ClcGroup **group,DWORD *flags)
+int cliHitTest(HWND hwnd,ClcData *dat,int testx,int testy,ClcContact **contact,ClcGroup **group,DWORD *flags)
{
ClcContact *hitcontact = NULL;
ClcGroup *hitgroup = NULL;
@@ -130,7 +130,7 @@ int cliHitTest(HWND hwnd,struct ClcData *dat,int testx,int testy,ClcContact **co return hit;
}
-void cliScrollTo(HWND hwnd,struct ClcData *dat,int desty,int noSmooth)
+void cliScrollTo(HWND hwnd,ClcData *dat,int desty,int noSmooth)
{
DWORD startTick,nowTick;
int oldy = dat->yScroll;
@@ -190,7 +190,7 @@ void cliScrollTo(HWND hwnd,struct ClcData *dat,int desty,int noSmooth) }
-void cliRecalcScrollBar(HWND hwnd,struct ClcData *dat)
+void cliRecalcScrollBar(HWND hwnd,ClcData *dat)
{
SCROLLINFO si = {0};
RECT clRect;
@@ -243,10 +243,10 @@ static LRESULT CALLBACK RenameEditSubclassProc(HWND hwnd, UINT msg, WPARAM wPara switch(wParam)
{
case VK_RETURN:
- pcli->pfnEndRename(GetParent(hwnd),(struct ClcData*)GetWindowLongPtr(hwnd,GWLP_USERDATA),1);
+ pcli->pfnEndRename(GetParent(hwnd),(ClcData*)GetWindowLongPtr(hwnd,GWLP_USERDATA),1);
return 0;
case VK_ESCAPE:
- pcli->pfnEndRename(GetParent(hwnd),(struct ClcData*)GetWindowLongPtr(hwnd,GWLP_USERDATA),0);
+ pcli->pfnEndRename(GetParent(hwnd),(ClcData*)GetWindowLongPtr(hwnd,GWLP_USERDATA),0);
return 0;
}
break;
@@ -259,14 +259,14 @@ static LRESULT CALLBACK RenameEditSubclassProc(HWND hwnd, UINT msg, WPARAM wPara }
return DLGC_WANTMESSAGE;
case WM_KILLFOCUS:
- pcli->pfnEndRename(GetParent(hwnd),(struct ClcData*)GetWindowLongPtr(hwnd,GWLP_USERDATA),1);
+ pcli->pfnEndRename(GetParent(hwnd),(ClcData*)GetWindowLongPtr(hwnd,GWLP_USERDATA),1);
SendMessage(pcli->hwndContactTree,WM_SIZE,0,0);
return 0;
}
return CallWindowProc(OldRenameEditWndProc,hwnd,msg,wParam,lParam);
}
-void cliBeginRenameSelection(HWND hwnd,struct ClcData *dat)
+void cliBeginRenameSelection(HWND hwnd,ClcData *dat)
{
ClcContact *contact;
ClcGroup *group;
@@ -354,7 +354,7 @@ void cliBeginRenameSelection(HWND hwnd,struct ClcData *dat) SetFocus(dat->hwndRenameEdit);
}
-int GetDropTargetInformation(HWND hwnd,struct ClcData *dat,POINT pt)
+int GetDropTargetInformation(HWND hwnd,ClcData *dat,POINT pt)
{
RECT clRect;
int hit;
@@ -413,7 +413,7 @@ int GetDropTargetInformation(HWND hwnd,struct ClcData *dat,POINT pt) }
if (bottomItem != -1 && bottomcontact->type != CLCIT_GROUP)
{
- ClcGroup * gr = bottomgroup;
+ ClcGroup *gr = bottomgroup;
do
{
bottomItem = cliGetRowByIndex(dat,bottomItem-1,&bottomcontact,&bottomgroup);}
@@ -473,7 +473,7 @@ COLORREF sttGetColor(char * module, char * color, COLORREF defColor) else return db_get_dw(NULL, module, color, defColor);
}
void RegisterCLUIFonts( void );
-void LoadCLCFonts( HWND hwnd, struct ClcData *dat )
+void LoadCLCFonts( HWND hwnd, ClcData *dat )
{
RegisterCLUIFonts();
@@ -503,7 +503,7 @@ void LoadCLCFonts( HWND hwnd, struct ClcData *dat ) ReleaseDC( hwnd, hdc );
}
-void LoadCLCOptions(HWND hwnd, struct ClcData *dat )
+void LoadCLCOptions(HWND hwnd, ClcData *dat )
{
int i;
@@ -790,9 +790,9 @@ void LoadCLCOptions(HWND hwnd, struct ClcData *dat ) }
-int ExpandMetaContact(HWND hwnd, ClcContact * contact, struct ClcData * dat, BOOL bExpand)
+int ExpandMetaContact(HWND hwnd, ClcContact *contact, ClcData *dat, BOOL bExpand)
{
- ClcContact * ht = NULL;
+ ClcContact *ht = NULL;
KillTimer(hwnd,TIMERID_SUBEXPAND);
if (contact->type != CLCIT_CONTACT || contact->SubAllocated == 0 || contact->SubExpanded == bExpand || !db_get_b(NULL,"CLC","MetaExpanding",SETTING_METAEXPANDING_DEFAULT)) return 0;
contact->SubExpanded = bExpand;
@@ -803,7 +803,7 @@ int ExpandMetaContact(HWND hwnd, ClcContact * contact, struct ClcData * dat, BOO return contact->SubExpanded;
}
-int cliFindRowByText(HWND hwnd, struct ClcData *dat, const TCHAR *text, int prefixOk)
+int cliFindRowByText(HWND hwnd, ClcData *dat, const TCHAR *text, int prefixOk)
{
ClcGroup *group = &dat->list;
int testlen = lstrlen(text);
@@ -854,7 +854,7 @@ int cliFindRowByText(HWND hwnd, struct ClcData *dat, const TCHAR *text, int pref int i=0;
for (i=0; i < contact->SubAllocated; i++)
{
- ClcContact * subcontact = &(contact->subcontacts[i]);
+ ClcContact *subcontact = &(contact->subcontacts[i]);
bool found;
if (dat->filterSearch) {
diff --git a/plugins/Clist_modern/src/modern_clistevents.cpp b/plugins/Clist_modern/src/modern_clistevents.cpp index 55942cb862..e94d28eb18 100644 --- a/plugins/Clist_modern/src/modern_clistevents.cpp +++ b/plugins/Clist_modern/src/modern_clistevents.cpp @@ -33,7 +33,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. /* Declarations */
static HANDLE hNotifyFrame = NULL;
-static int EventArea_PaintCallbackProc(HWND hWnd, HDC hDC, RECT * rcPaint, HRGN rgn, DWORD dFlags, void * CallBackData);
+static int EventArea_PaintCallbackProc(HWND hWnd, HDC hDC, RECT *rcPaint, HRGN rgn, DWORD dFlags, void * CallBackData);
static int EventArea_Draw(HWND hwnd, HDC hDC);
static int EventArea_DrawWorker(HWND hwnd, HDC hDC);
static void EventArea_HideShowNotifyFrame();
@@ -240,7 +240,7 @@ struct event_area_t static event_area_t event_area;
-static BOOL sttDrawEventAreaBackground(HWND hwnd, HDC hdc, RECT * rect)
+static BOOL sttDrawEventAreaBackground(HWND hwnd, HDC hdc, RECT *rect)
{
BOOL bFloat = (GetParent(hwnd) != pcli->hwndContactList);
if (g_CluiData.fDisableSkinEngine || !g_CluiData.fLayered || bFloat)
@@ -309,7 +309,7 @@ void EventArea_ConfigureEventArea() }
-static int EventArea_PaintCallbackProc(HWND hWnd, HDC hDC, RECT * rcPaint, HRGN rgn, DWORD dFlags, void * CallBackData)
+static int EventArea_PaintCallbackProc(HWND hWnd, HDC hDC, RECT *rcPaint, HRGN rgn, DWORD dFlags, void * CallBackData)
{
return EventArea_Draw(hWnd,hDC);
}
diff --git a/plugins/Clist_modern/src/modern_clistmod.cpp b/plugins/Clist_modern/src/modern_clistmod.cpp index 3598024215..eef6c834ca 100644 --- a/plugins/Clist_modern/src/modern_clistmod.cpp +++ b/plugins/Clist_modern/src/modern_clistmod.cpp @@ -126,8 +126,7 @@ int cli_IconFromStatusMode(const char *szProto,int nStatus, HANDLE hContact) // substitute params by mostonline contact datas
HANDLE hMostOnlineContact = (HANDLE)CallService(MS_MC_GETMOSTONLINECONTACT,(WPARAM)hActContact,0);
if (hMostOnlineContact) {
- pClcCacheEntry cacheEntry;
- cacheEntry = (pClcCacheEntry)pcli->pfnGetCacheEntry(hMostOnlineContact);
+ ClcCacheEntry *cacheEntry = pcli->pfnGetCacheEntry(hMostOnlineContact);
if (cacheEntry && cacheEntry->m_cache_cszProto) {
szActProto = cacheEntry->m_cache_cszProto;
nActStatus = pdnce___GetStatus( cacheEntry );
@@ -155,7 +154,7 @@ int cli_IconFromStatusMode(const char *szProto,int nStatus, HANDLE hContact) return corecli.pfnIconFromStatusMode(szProto,nStatus,NULL);
}
-int GetContactIconC(pClcCacheEntry cacheEntry)
+int GetContactIconC(ClcCacheEntry *cacheEntry)
{
return ExtIconFromStatusMode(cacheEntry->hContact,cacheEntry->m_cache_cszProto,cacheEntry->m_cache_cszProto == NULL ? ID_STATUS_OFFLINE : pdnce___GetStatus( cacheEntry ));
}
diff --git a/plugins/Clist_modern/src/modern_clistsettings.cpp b/plugins/Clist_modern/src/modern_clistsettings.cpp index fc91d4245c..484ba96b29 100644 --- a/plugins/Clist_modern/src/modern_clistsettings.cpp +++ b/plugins/Clist_modern/src/modern_clistsettings.cpp @@ -29,7 +29,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. void InsertContactIntoTree(HANDLE hContact,int status);
static ClcCacheEntry *displayNameCache;
-void CListSettings_FreeCacheItemDataOption( pClcCacheEntry pDst, DWORD flag );
+void CListSettings_FreeCacheItemDataOption( ClcCacheEntry *pDst, DWORD flag );
int PostAutoRebuidMessage(HWND hwnd);
static int displayNameCacheSize;
@@ -40,14 +40,14 @@ char *GetProtoForContact(HANDLE hContact); int GetStatusForContact(HANDLE hContact,char *szProto);
TCHAR *UnknownConctactTranslatedName = NULL;
-void InvalidateDNCEbyPointer(HANDLE hContact,pClcCacheEntry pdnce,int SettingType);
+void InvalidateDNCEbyPointer(HANDLE hContact,ClcCacheEntry *pdnce,int SettingType);
static int handleCompare( void* c1, void* c2 )
{
INT_PTR p1, p2;
- ClcCacheEntry * dnce1 = (ClcCacheEntry *)c1;
- ClcCacheEntry * dnce2 = (ClcCacheEntry *)c2;
+ ClcCacheEntry *dnce1 = (ClcCacheEntry *)c1;
+ ClcCacheEntry *dnce2 = (ClcCacheEntry *)c2;
p1 = (INT_PTR)dnce1->hContact;
p2 = (INT_PTR)dnce2->hContact;
@@ -103,12 +103,12 @@ ClcCacheEntry* cliGetCacheEntry(HANDLE hContact) return p;
}
-void CListSettings_FreeCacheItemData(pClcCacheEntry pDst)
+void CListSettings_FreeCacheItemData(ClcCacheEntry *pDst)
{
CListSettings_FreeCacheItemDataOption( pDst, CCI_ALL);
}
-void CListSettings_FreeCacheItemDataOption( pClcCacheEntry pDst, DWORD flag )
+void CListSettings_FreeCacheItemDataOption( ClcCacheEntry *pDst, DWORD flag )
{
if ( !pDst)
return;
@@ -127,11 +127,11 @@ void CListSettings_FreeCacheItemDataOption( pClcCacheEntry pDst, DWORD flag ) }
}
-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);
-void CListSettings_CopyCacheItems(pClcCacheEntry pDst, pClcCacheEntry pSrc, DWORD flag)
+void CListSettings_CopyCacheItems(ClcCacheEntry *pDst, ClcCacheEntry *pSrc, DWORD flag)
{
if ( !pDst || !pSrc) return;
CListSettings_FreeCacheItemDataOption(pDst, flag);
@@ -177,12 +177,12 @@ void CListSettings_CopyCacheItems(pClcCacheEntry pDst, pClcCacheEntry pSrc, DWOR }
}
-int CListSettings_GetCopyFromCache(pClcCacheEntry pDest, DWORD flag)
+int CListSettings_GetCopyFromCache(ClcCacheEntry *pDest, DWORD flag)
{
if ( !pDest || !pDest->hContact)
return -1;
- pClcCacheEntry pSource = (pClcCacheEntry)pcli->pfnGetCacheEntry(pDest->hContact);
+ ClcCacheEntry *pSource = pcli->pfnGetCacheEntry(pDest->hContact);
if ( !pSource)
return -1;
@@ -190,12 +190,12 @@ int CListSettings_GetCopyFromCache(pClcCacheEntry pDest, DWORD flag) return 0;
}
-int CListSettings_SetToCache(pClcCacheEntry pSrc, DWORD flag)
+int CListSettings_SetToCache(ClcCacheEntry *pSrc, DWORD flag)
{
if ( !pSrc || !pSrc->hContact)
return -1;
- pClcCacheEntry pDst = (pClcCacheEntry)pcli->pfnGetCacheEntry(pSrc->hContact);
+ ClcCacheEntry *pDst = pcli->pfnGetCacheEntry(pSrc->hContact);
if ( !pDst)
return -1;
@@ -203,7 +203,7 @@ int CListSettings_SetToCache(pClcCacheEntry pSrc, DWORD flag) return 0;
}
-void cliFreeCacheItem( pClcCacheEntry p )
+void cliFreeCacheItem( ClcCacheEntry *p )
{
HANDLE hContact = p->hContact;
TRACEVAR("cliFreeCacheItem hContact = %d",hContact);
@@ -215,7 +215,7 @@ void cliFreeCacheItem( pClcCacheEntry p ) p->ssThirdLine.DestroySmileyList();
}
-void cliCheckCacheItem(pClcCacheEntry pdnce)
+void cliCheckCacheItem(ClcCacheEntry *pdnce)
{
if (pdnce == NULL)
return;
@@ -292,7 +292,7 @@ void IvalidateDisplayNameCache(DWORD mode) int i;
for ( i=0; i < clistCache->realCount; i++)
{
- PDNCE pdnce = (PDNCE)clistCache->items[i];
+ ClcCacheEntry *pdnce = (ClcCacheEntry *)clistCache->items[i];
if (mode&16)
{
InvalidateDNCEbyPointer(pdnce->hContact,pdnce,16);
@@ -301,7 +301,7 @@ void IvalidateDisplayNameCache(DWORD mode) }
}
-void InvalidateDNCEbyPointer(HANDLE hContact, pClcCacheEntry pdnce, int SettingType)
+void InvalidateDNCEbyPointer(HANDLE hContact, ClcCacheEntry *pdnce, int SettingType)
{
if (hContact == NULL || pdnce == NULL)
return;
@@ -348,8 +348,8 @@ void InvalidateDNCEbyPointer(HANDLE hContact, pClcCacheEntry pdnce, int SettingT char *GetContactCachedProtocol(HANDLE hContact)
{
- pClcCacheEntry cacheEntry = NULL;
- cacheEntry = (pClcCacheEntry)pcli->pfnGetCacheEntry(hContact);
+ ClcCacheEntry *cacheEntry = NULL;
+ cacheEntry = pcli->pfnGetCacheEntry(hContact);
if (cacheEntry && cacheEntry->m_cache_cszProto)
return cacheEntry->m_cache_cszProto;
@@ -400,8 +400,8 @@ LBL_Unknown: int GetContactInfosForSort(HANDLE hContact,char **Proto,TCHAR **Name,int *Status)
{
- pClcCacheEntry cacheEntry = NULL;
- cacheEntry = (pClcCacheEntry)pcli->pfnGetCacheEntry(hContact);
+ ClcCacheEntry *cacheEntry = NULL;
+ cacheEntry = pcli->pfnGetCacheEntry(hContact);
if (cacheEntry != NULL)
{
if (Proto != NULL) *Proto = cacheEntry->m_cache_cszProto;
@@ -414,8 +414,8 @@ int GetContactInfosForSort(HANDLE hContact,char **Proto,TCHAR **Name,int *Status int GetContactCachedStatus(HANDLE hContact)
{
- pClcCacheEntry cacheEntry = NULL;
- cacheEntry = (pClcCacheEntry)pcli->pfnGetCacheEntry(hContact);
+ ClcCacheEntry *cacheEntry = NULL;
+ cacheEntry = pcli->pfnGetCacheEntry(hContact);
return pdnce___GetStatus( cacheEntry );
}
@@ -435,7 +435,7 @@ int ContactSettingChanged(WPARAM wParam,LPARAM lParam) if (MirandaExiting() || !pcli || !clistCache || hContact == NULL)
return 0;
- pClcCacheEntry pdnce = (pClcCacheEntry)pcli->pfnGetCacheEntry(hContact);
+ ClcCacheEntry *pdnce = pcli->pfnGetCacheEntry(hContact);
if (pdnce == NULL) {
TRACE("!!! Very bad pdnce not found.");
return 0;
@@ -472,7 +472,7 @@ int ContactSettingChanged(WPARAM wParam,LPARAM lParam) if ((db_get_w(NULL,"CList","SecondLineType",0) == TEXT_STATUS_MESSAGE || db_get_w(NULL,"CList","ThirdLineType",0) == TEXT_STATUS_MESSAGE) && pdnce->hContact && pdnce->m_cache_cszProto)
amRequestAwayMsg(hContact);
- pcli->pfnClcBroadcast( INTM_STATUSCHANGED,wParam,0);
+ pcli->pfnClcBroadcast(INTM_STATUSCHANGED, wParam, 0);
cli_ChangeContactIcon(hContact, ExtIconFromStatusMode(hContact,cws->szModule, cws->value.wVal), 0); //by FYR
pcli->pfnSortContacts();
}
@@ -498,8 +498,7 @@ int ContactSettingChanged(WPARAM wParam,LPARAM lParam) else if ( !strcmp(cws->szSetting,"Hidden")) {
InvalidateDNCEbyPointer(hContact,pdnce,cws->value.type);
- if (cws->value.type == DBVT_DELETED || cws->value.bVal == 0)
- {
+ if (cws->value.type == DBVT_DELETED || cws->value.bVal == 0) {
char *szProto = (char*)CallService(MS_PROTO_GETCONTACTBASEPROTO,wParam,0);
cli_ChangeContactIcon(hContact,ExtIconFromStatusMode(hContact,szProto,szProto == NULL?ID_STATUS_OFFLINE:db_get_w(hContact,szProto,"Status",ID_STATUS_OFFLINE)),1); //by FYR
}
@@ -512,10 +511,8 @@ int ContactSettingChanged(WPARAM wParam,LPARAM lParam) }
else if ( !strcmp(cws->szModule,"Protocol")) {
if ( !strcmp(cws->szSetting,"p")) {
- char *szProto;
InvalidateDNCEbyPointer(hContact,pdnce,cws->value.type);
- if (cws->value.type == DBVT_DELETED) szProto = NULL;
- else szProto = cws->value.pszVal;
+ char *szProto = (cws->value.type == DBVT_DELETED) ? NULL : cws->value.pszVal;
cli_ChangeContactIcon(hContact,ExtIconFromStatusMode(hContact,szProto,szProto == NULL?ID_STATUS_OFFLINE:db_get_w(hContact,szProto,"Status",ID_STATUS_OFFLINE)),0); //by FYR
}
}
diff --git a/plugins/Clist_modern/src/modern_clui.cpp b/plugins/Clist_modern/src/modern_clui.cpp index ea49a86059..913617b2dc 100644 --- a/plugins/Clist_modern/src/modern_clui.cpp +++ b/plugins/Clist_modern/src/modern_clui.cpp @@ -329,7 +329,7 @@ HRESULT CLUI::CreateUIFrames() return S_OK;
}
-HRESULT CLUI::FillAlphaChannel( HDC hDC, RECT * prcParent, BYTE bAlpha)
+HRESULT CLUI::FillAlphaChannel( HDC hDC, RECT *prcParent, BYTE bAlpha)
{
RECT rcWindow;
GetWindowRect( m_hWnd, &rcWindow );
@@ -1161,7 +1161,7 @@ static int CLUI_DrawMenuBackGround(HWND hwnd, HDC hdc, int item, int state) if ( !fnGetMenuBarInfo )
return 1;
- ClcData *dat = (struct ClcData*)GetWindowLongPtr(pcli->hwndContactTree,0);
+ ClcData *dat = (ClcData*)GetWindowLongPtr(pcli->hwndContactTree,0);
if ( !dat)
return 1;
@@ -1302,7 +1302,7 @@ static int CLUI_DrawMenuBackGround(HWND hwnd, HDC hdc, int item, int state) return 0;
}
-int CLUI_SizingGetWindowRect(HWND hwnd,RECT * rc)
+int CLUI_SizingGetWindowRect(HWND hwnd,RECT *rc)
{
if (mutex_bDuringSizing && hwnd == pcli->hwndContactList)
*rc = rcSizingRect;
@@ -1314,18 +1314,18 @@ int CLUI_SizingGetWindowRect(HWND hwnd,RECT * rc) int CLUI_SyncGetPDNCE(WPARAM wParam, LPARAM lParam)
{
- return CListSettings_GetCopyFromCache((pClcCacheEntry)lParam, wParam ? (DWORD) wParam : CCI_ALL );
+ return CListSettings_GetCopyFromCache((ClcCacheEntry *)lParam, wParam ? (DWORD) wParam : CCI_ALL );
}
int CLUI_SyncSetPDNCE(WPARAM wParam, LPARAM lParam)
{
- return CListSettings_SetToCache((pClcCacheEntry)lParam, wParam ? (DWORD) wParam : CCI_ALL );
+ return CListSettings_SetToCache((ClcCacheEntry *)lParam, wParam ? (DWORD) wParam : CCI_ALL );
}
int CLUI_SyncGetShortData(WPARAM wParam, LPARAM lParam)
{
HWND hwnd = (HWND) wParam;
- struct ClcData *dat = (struct ClcData * )GetWindowLongPtr(hwnd,0);
+ ClcData *dat = (ClcData *)GetWindowLongPtr(hwnd,0);
return ClcGetShortData(dat,(struct SHORTDATA *)lParam);
}
@@ -2741,7 +2741,7 @@ LRESULT CLUI::OnMeasureItem( UINT msg, WPARAM wParam, LPARAM lParam ) LRESULT CLUI::OnDrawItem( UINT msg, WPARAM wParam, LPARAM lParam )
{
- struct ClcData * dat = (struct ClcData*)GetWindowLongPtr(pcli->hwndContactTree,0);
+ ClcData *dat = (ClcData*)GetWindowLongPtr(pcli->hwndContactTree,0);
LPDRAWITEMSTRUCT dis = (LPDRAWITEMSTRUCT)lParam;
if ( !dat) return 0;
diff --git a/plugins/Clist_modern/src/modern_cluiframes.cpp b/plugins/Clist_modern/src/modern_cluiframes.cpp index 942be6c26e..de2b26bf7e 100644 --- a/plugins/Clist_modern/src/modern_cluiframes.cpp +++ b/plugins/Clist_modern/src/modern_cluiframes.cpp @@ -117,7 +117,7 @@ static int sortfunc(const void *a,const void *b) if (sd1->order < sd2->order){return(-1);};
return (0);
};
-int CLUIFrames_OnMoving( HWND hwnd, RECT * r)
+int CLUIFrames_OnMoving( HWND hwnd, RECT *r)
{
int i;
g_CluiData.mutexPreventDockMoving = 0;
@@ -2635,7 +2635,7 @@ int CLUIFramesOnClistResize(WPARAM wParam,LPARAM lParam) {
RECT oldRect;
POINT pt;
- RECT * newRect = (RECT *)lParam;
+ RECT *newRect = (RECT *)lParam;
int dl,dt,dr,db;
GetWindowRect((HWND)wParam,&oldRect);
pt.x = nRect.left;
@@ -2860,7 +2860,7 @@ void DrawBackGround(HWND hwnd,HDC mhdc, HBITMAP hBmpBackground, COLORREF bkColou }
-int DrawTitleBar(HDC hdcMem2,RECT * rect,int Frameid)
+int DrawTitleBar(HDC hdcMem2,RECT *rect,int Frameid)
{
int pos;
BOOL bThemed = FALSE;
diff --git a/plugins/Clist_modern/src/modern_gdiplus.cpp b/plugins/Clist_modern/src/modern_gdiplus.cpp index f07e294dbd..b70ebc3bb0 100644 --- a/plugins/Clist_modern/src/modern_gdiplus.cpp +++ b/plugins/Clist_modern/src/modern_gdiplus.cpp @@ -305,4 +305,4 @@ void GDIPlus_ExtractAnimatedGIF (TCHAR * szName, int width, int height, HBITMAP pSizeAvatar->cy = clipHeight;
}
GdiFlush();
-}
\ No newline at end of file +}
diff --git a/plugins/Clist_modern/src/modern_gettextasync.cpp b/plugins/Clist_modern/src/modern_gettextasync.cpp index 7dccece7b9..ef7631a2b8 100644 --- a/plugins/Clist_modern/src/modern_gettextasync.cpp +++ b/plugins/Clist_modern/src/modern_gettextasync.cpp @@ -43,7 +43,7 @@ int CLUI_SyncGetShortData(WPARAM wParam, LPARAM lParam); typedef struct _GetTextAsyncItem {
HANDLE hContact;
- struct ClcData *dat;
+ ClcData *dat;
struct _GetTextAsyncItem *Next;
} GTACHAINITEM;
@@ -152,7 +152,7 @@ BOOL gtaWakeThread() return FALSE;
}
-int gtaAddRequest(struct ClcData *dat,ClcContact *contact,HANDLE hContact)
+int gtaAddRequest(ClcData *dat,ClcContact *contact,HANDLE hContact)
{
if (MirandaExiting()) return 0;
gtalock;
diff --git a/plugins/Clist_modern/src/modern_rowheight_funcs.cpp b/plugins/Clist_modern/src/modern_rowheight_funcs.cpp index 18defab4bd..9e041b48a3 100644 --- a/plugins/Clist_modern/src/modern_rowheight_funcs.cpp +++ b/plugins/Clist_modern/src/modern_rowheight_funcs.cpp @@ -30,9 +30,9 @@ Created by Pescuma, modified by Artem Shpynov #include "hdr/modern_clcpaint.h"
int g_mutex_nCalcRowHeightLock = 0;
-int mod_CalcRowHeight_worker(struct ClcData *dat, HWND hwnd, ClcContact *contact, int item);
-void RowHeights_CalcRowHeights_Worker(struct ClcData *dat, HWND hwnd);
-int RowHeights_GetRowHeight_worker(struct ClcData *dat, HWND hwnd, ClcContact *contact, int item);
+int mod_CalcRowHeight_worker(ClcData *dat, HWND hwnd, ClcContact *contact, int item);
+void RowHeights_CalcRowHeights_Worker(ClcData *dat, HWND hwnd);
+int RowHeights_GetRowHeight_worker(ClcData *dat, HWND hwnd, ClcContact *contact, int item);
/*
*
@@ -68,7 +68,7 @@ SIZE GetAvatarSize(int imageWidth, int imageHeight, int maxWidth, int maxHeight) return sz;
}
-int RowHeight_CalcRowHeight(struct ClcData *dat, HWND hwnd, ClcContact *contact, int item)
+int RowHeight_CalcRowHeight(ClcData *dat, HWND hwnd, ClcContact *contact, int item)
{
if (MirandaExiting()) return 0;
g_mutex_nCalcRowHeightLock++;
@@ -77,16 +77,16 @@ int RowHeight_CalcRowHeight(struct ClcData *dat, HWND hwnd, ClcContact *contact, return res;
}
-int mod_CalcRowHeight_worker(struct ClcData *dat, HWND hwnd, ClcContact *contact, int item)
+int mod_CalcRowHeight_worker(ClcData *dat, HWND hwnd, ClcContact *contact, int item)
{
BYTE i=0;
int res = 0;
int height = 0;
- ClcCacheEntry * pdnce;
+ ClcCacheEntry *pdnce;
BOOL hasAvatar = FALSE;
DWORD style;
style = GetWindowLongPtr(hwnd,GWL_STYLE);
- pdnce = (ClcCacheEntry*)pcli->pfnGetCacheEntry(contact->hContact);
+ pdnce = pcli->pfnGetCacheEntry(contact->hContact);
if ( !RowHeights_Alloc(dat, item + 1))
return -1;
@@ -342,7 +342,7 @@ BOOL RowHeights_Initialize(struct ClcData *dat) return TRUE;
}
-void RowHeights_Free(struct ClcData *dat)
+void RowHeights_Free(ClcData *dat)
{
if (dat->row_heights != NULL) {
free(dat->row_heights);
@@ -353,12 +353,12 @@ void RowHeights_Free(struct ClcData *dat) dat->row_heights_size = 0;
}
-void RowHeights_Clear(struct ClcData *dat)
+void RowHeights_Clear(ClcData *dat)
{
dat->row_heights_size = 0;
}
-BOOL RowHeights_Alloc(struct ClcData *dat, int size)
+BOOL RowHeights_Alloc(ClcData *dat, int size)
{
if (size > dat->row_heights_size) {
if (size > dat->row_heights_allocated) {
@@ -403,7 +403,7 @@ static int contact_fonts[] = { static int other_fonts[] = {FONTID_OPENGROUPS, FONTID_OPENGROUPCOUNTS,FONTID_CLOSEDGROUPS, FONTID_CLOSEDGROUPCOUNTS, FONTID_DIVIDERS, FONTID_CONTACT_TIME};
-int RowHeights_GetMaxRowHeight(struct ClcData *dat, HWND hwnd)
+int RowHeights_GetMaxRowHeight(ClcData *dat, HWND hwnd)
{
int max_height = 0, i, tmp;
DWORD style = GetWindowLongPtr(hwnd,GWL_STYLE);
@@ -462,7 +462,7 @@ int RowHeights_GetMaxRowHeight(struct ClcData *dat, HWND hwnd) }
// Calc and store row height for all items in the list
-void RowHeights_CalcRowHeights(struct ClcData *dat, HWND hwnd)
+void RowHeights_CalcRowHeights(ClcData *dat, HWND hwnd)
{
if (MirandaExiting()) return;
g_mutex_nCalcRowHeightLock++;
@@ -470,7 +470,7 @@ void RowHeights_CalcRowHeights(struct ClcData *dat, HWND hwnd) g_mutex_nCalcRowHeightLock--;
}
-void RowHeights_CalcRowHeights_Worker(struct ClcData *dat, HWND hwnd)
+void RowHeights_CalcRowHeights_Worker(ClcData *dat, HWND hwnd)
{
if (MirandaExiting()) return;
@@ -536,7 +536,7 @@ void RowHeights_CalcRowHeights_Worker(struct 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)
{
if (MirandaExiting()) return 0;
g_mutex_nCalcRowHeightLock++;
@@ -545,7 +545,7 @@ int RowHeights_GetRowHeight(struct ClcData *dat, HWND hwnd, ClcContact *contact, return res;
}
-int RowHeights_GetRowHeight_worker(struct ClcData *dat, HWND hwnd, ClcContact *contact, int item)
+int RowHeights_GetRowHeight_worker(ClcData *dat, HWND hwnd, ClcContact *contact, int item)
{
if (gl_RowRoot)
return RowHeight_CalcRowHeight(dat, hwnd, contact, item);
@@ -560,7 +560,7 @@ int RowHeights_GetRowHeight_worker(struct ClcData *dat, HWND hwnd, ClcContact *c return -1;
int height = 0;
- ClcCacheEntry *pdnce = (contact->type == CLCIT_CONTACT) ? (ClcCacheEntry*)pcli->pfnGetCacheEntry(contact->hContact) : NULL;
+ ClcCacheEntry *pdnce = (contact->type == CLCIT_CONTACT) ? pcli->pfnGetCacheEntry(contact->hContact) : NULL;
if (dat->row_variable_height) {
if ( !dat->text_ignore_size_for_row_height) {
@@ -628,7 +628,7 @@ int RowHeights_GetRowHeight_worker(struct ClcData *dat, HWND hwnd, ClcContact *c }
// Calc item top Y (using stored data)
-int cliGetRowTopY(struct ClcData *dat, int item)
+int cliGetRowTopY(ClcData *dat, int item)
{
if (item >= dat->row_heights_size)
return cliGetRowBottomY(dat,item-1);
@@ -640,7 +640,7 @@ int cliGetRowTopY(struct ClcData *dat, int item) }
// Calc item bottom Y (using stored data)
-int cliGetRowBottomY(struct ClcData *dat, int item)
+int cliGetRowBottomY(ClcData *dat, int item)
{
if (item >= dat->row_heights_size)
return -1;
@@ -653,7 +653,7 @@ int cliGetRowBottomY(struct ClcData *dat, int item) // Calc total height of rows (using stored data)
-int cliGetRowTotalHeight(struct ClcData *dat)
+int cliGetRowTotalHeight(ClcData *dat)
{
int y = 0;
for (int i=0 ; i < dat->row_heights_size ; i++)
@@ -663,7 +663,7 @@ int cliGetRowTotalHeight(struct ClcData *dat) }
// Return the line that pos_y is at or -1 (using stored data)
-int cliRowHitTest(struct ClcData *dat, int pos_y)
+int cliRowHitTest(ClcData *dat, int pos_y)
{
if (pos_y < 0)
return -1;
@@ -678,7 +678,7 @@ int cliRowHitTest(struct ClcData *dat, int pos_y) return -1;
}
-int cliGetRowHeight(struct ClcData *dat, int item)
+int cliGetRowHeight(ClcData *dat, int item)
{
if ( item >= dat->row_heights_size || item < 0 )
return dat->rowHeight;
diff --git a/plugins/Clist_modern/src/modern_skinbutton.cpp b/plugins/Clist_modern/src/modern_skinbutton.cpp index 3f7de498a3..06c54d40be 100644 --- a/plugins/Clist_modern/src/modern_skinbutton.cpp +++ b/plugins/Clist_modern/src/modern_skinbutton.cpp @@ -38,7 +38,7 @@ BOOL ModernSkinButtonModuleIsLoaded = FALSE; static HANDLE hookSystemShutdown_ModernSkinButton = NULL;
static LRESULT CALLBACK ModernSkinButtonWndProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam);
int ModernSkinButtonUnloadModule(WPARAM wParam, LPARAM lParam);
-int SkinSelector_DeleteMask(MODERNMASK * mm);
+int SkinSelector_DeleteMask(MODERNMASK *mm);
HWND SetToolTip(HWND hwnd, TCHAR * tip);
typedef struct _ModernSkinButtonCtrl
@@ -731,7 +731,7 @@ int ModernSkinButtonDeleteAll() return 0;
}
-int ModernSkinButton_ReposButtons(HWND parent, BYTE draw, RECT * r)
+int ModernSkinButton_ReposButtons(HWND parent, BYTE draw, RECT *r)
{
DWORD i;
RECT rc;
diff --git a/plugins/Clist_modern/src/modern_skinengine.cpp b/plugins/Clist_modern/src/modern_skinengine.cpp index 5cf65ac541..98abc69630 100644 --- a/plugins/Clist_modern/src/modern_skinengine.cpp +++ b/plugins/Clist_modern/src/modern_skinengine.cpp @@ -83,7 +83,7 @@ static BOOL ske_GetMaskBit(BYTE *line, int x); static INT_PTR ske_Service_AlphaTextOut(WPARAM wParam,LPARAM lParam);
static INT_PTR ske_Service_DrawIconEx(WPARAM wParam,LPARAM lParam);
-static int ske_AlphaTextOut (HDC hDC, LPCTSTR lpString, int nCount, RECT * lpRect, UINT format, DWORD ARGBcolor);
+static int ske_AlphaTextOut (HDC hDC, LPCTSTR lpString, int nCount, RECT *lpRect, UINT format, DWORD ARGBcolor);
static void ske_AddParseTextGlyphObject(char * szGlyphTextID,char * szDefineString,SKINOBJECTSLIST *Skin);
static void ske_AddParseSkinFont(char * szFontID,char * szDefineString,SKINOBJECTSLIST *Skin);
static int ske_DeleteAllSettingInSection(char * SectionName);
@@ -694,7 +694,7 @@ BOOL ske_SetRgnOpaque(HDC memdc,HRGN hrgn, BOOL force) RGNDATA * rdata;
DWORD rgnsz;
DWORD d;
- RECT * rect;
+ RECT *rect;
if (g_CluiData.fDisableSkinEngine && !force) return TRUE;
rgnsz = GetRegionData(hrgn,0,NULL);
rdata = (RGNDATA *) mir_alloc(rgnsz);
@@ -761,7 +761,7 @@ BOOL ske_SetRectOpaque(HDC memdc,RECT *fr, BOOL force) return 1;
}
-static BOOL ske_SkinFillRectByGlyph(HDC hDest, HDC hSource, RECT * rFill, RECT * rGlyph, RECT * rClip, BYTE mode, BYTE drawMode, int depth)
+static BOOL ske_SkinFillRectByGlyph(HDC hDest, HDC hSource, RECT *rFill, RECT *rGlyph, RECT *rClip, BYTE mode, BYTE drawMode, int depth)
{
int destw = 0, desth = 0;
int xstart = 0, xmax = 0;
@@ -1646,7 +1646,7 @@ static LPSKINOBJECTDESCRIPTOR ske_FindObject(const char * szName, BYTE objType, return skin_FindObjectByRequest((char *)szName,sk->pMaskList);
}
-static LPSKINOBJECTDESCRIPTOR ske_FindObjectByMask(MODERNMASK * pModernMask, BYTE objType, SKINOBJECTSLIST* Skin)
+static LPSKINOBJECTDESCRIPTOR ske_FindObjectByMask(MODERNMASK *pModernMask, BYTE objType, SKINOBJECTSLIST* Skin)
{
// DWORD i;
SKINOBJECTSLIST* sk;
@@ -2735,7 +2735,7 @@ static BOOL ske_DrawTextEffect(BYTE* destPt,BYTE* maskPt, DWORD width, DWORD hei return FALSE;
}
-static int ske_AlphaTextOut (HDC hDC, LPCTSTR lpString, int nCount, RECT * lpRect, UINT format, DWORD ARGBcolor)
+static int ske_AlphaTextOut (HDC hDC, LPCTSTR lpString, int nCount, RECT *lpRect, UINT format, DWORD ARGBcolor)
{
if ( !( lpString && lpRect ))
{
@@ -3010,7 +3010,7 @@ static int ske_AlphaTextOut (HDC hDC, LPCTSTR lpString, int nCount, RECT * lpRec return 0;
}
-static int ske_DrawTextWithEffectWorker( HDC hdc, LPCTSTR lpString, int nCount, RECT * lpRect, UINT format, MODERNFONTEFFECT * effect )
+static int ske_DrawTextWithEffectWorker( HDC hdc, LPCTSTR lpString, int nCount, RECT *lpRect, UINT format, MODERNFONTEFFECT * effect )
{
if (format&DT_CALCRECT) return DrawText(hdc,lpString,nCount,lpRect,format);
@@ -3039,7 +3039,7 @@ INT_PTR ske_Service_DrawTextWithEffect( WPARAM wParam, LPARAM lParam ) return ske_DrawTextWithEffectWorker( p->hdc, p->lpchText, p->cchText, p->lprc, p->dwDTFormat, p->pEffect );
}
-BOOL ske_DrawTextA(HDC hdc, char * lpString, int nCount, RECT * lpRect, UINT format)
+BOOL ske_DrawTextA(HDC hdc, char * lpString, int nCount, RECT *lpRect, UINT format)
{
TCHAR *buf = mir_a2u(lpString);
BOOL res;
@@ -3049,7 +3049,7 @@ BOOL ske_DrawTextA(HDC hdc, char * lpString, int nCount, RECT * lpRect, UINT for }
-BOOL ske_DrawText(HDC hdc, LPCTSTR lpString, int nCount, RECT * lpRect, UINT format)
+BOOL ske_DrawText(HDC hdc, LPCTSTR lpString, int nCount, RECT *lpRect, UINT format)
{
DWORD form = 0, color = 0;
RECT r = *lpRect;
@@ -3360,7 +3360,7 @@ BOOL ske_DrawIconEx(HDC hdcDst,int xLeft,int yTop,HICON hIcon,int cxWidth,int cy -int ske_PrepeareImageButDontUpdateIt(RECT * r)
+int ske_PrepeareImageButDontUpdateIt(RECT *r)
{
if (g_CluiData.fLayered)
{
@@ -3687,7 +3687,7 @@ static int ske_ValidateSingleFrameImage(FRAMEWND * Frame, BOOL SkipBkgBlitting) return 1;
}
-int ske_BltBackImage (HWND destHWND, HDC destDC, RECT * BltClientRect)
+int ske_BltBackImage (HWND destHWND, HDC destDC, RECT *BltClientRect)
{
POINT ptMainWnd = {0};
POINT ptChildWnd = {0};
@@ -3813,7 +3813,7 @@ int ske_DrawNonFramedObjects(BOOL Erase,RECT *r) flag_bJustDrawNonFramedObjects = 1;
return 0;
}
-int ske_ValidateFrameImageProc(RECT * r) // Calling queued frame paint procs and refresh image
+int ske_ValidateFrameImageProc(RECT *r) // Calling queued frame paint procs and refresh image
{
RECT wnd = {0};
BOOL IsNewCache = 0;
@@ -3908,7 +3908,7 @@ int ske_UpdateWindowImage() }
-int ske_UpdateWindowImageRect(RECT * r) // Update window with current image and
+int ske_UpdateWindowImageRect(RECT *r) // Update window with current image and
{
//if not validity -> ValidateImageProc
//else Update using current alpha
@@ -3956,7 +3956,7 @@ int ske_JustUpdateWindowImage() GetWindowRect(pcli->hwndContactList,&r);
return ske_JustUpdateWindowImageRect(&r);
}
-int ske_JustUpdateWindowImageRect(RECT * rty)
+int ske_JustUpdateWindowImageRect(RECT *rty)
//Update window image
{
BLENDFUNCTION bf = {AC_SRC_OVER, 0,g_CluiData.bCurrentAlpha, AC_SRC_ALPHA };
diff --git a/plugins/Clist_modern/src/modern_skinselector.cpp b/plugins/Clist_modern/src/modern_skinselector.cpp index 76048d652a..be074163ae 100644 --- a/plugins/Clist_modern/src/modern_skinselector.cpp +++ b/plugins/Clist_modern/src/modern_skinselector.cpp @@ -34,7 +34,7 @@ LISTMODERNMASK * MainModernMaskList = NULL; /// IMPLEMENTATIONS
-char * ModernMaskToString(MODERNMASK * mm, char * buf, UINT bufsize)
+char * ModernMaskToString(MODERNMASK *mm, char * buf, UINT bufsize)
{
int i=0;
for (i=0; i < (int)mm->dwParamCnt;i++)
@@ -51,7 +51,7 @@ char * ModernMaskToString(MODERNMASK * mm, char * buf, UINT bufsize) }
return buf;
}
-int SkinSelector_DeleteMask(MODERNMASK * mm)
+int SkinSelector_DeleteMask(MODERNMASK *mm)
{
int i;
if ( !mm->pl_Params) return 0;
@@ -211,7 +211,7 @@ DWORD mod_CalcHash(const char * a) return Val;
}
*/
-int AddModernMaskToList(MODERNMASK * mm, LISTMODERNMASK * mmTemplateList)
+int AddModernMaskToList(MODERNMASK *mm, LISTMODERNMASK * mmTemplateList)
{
if ( !mmTemplateList || !mm) return -1;
mmTemplateList->pl_Masks = (MODERNMASK *)mir_realloc(mmTemplateList->pl_Masks,sizeof(MODERNMASK)*(mmTemplateList->dwMaskCnt+1));
@@ -244,7 +244,7 @@ int DeleteMaskByItID(DWORD mID,LISTMODERNMASK * mmTemplateList) }
else
{
- MODERNMASK * newAlocation;
+ MODERNMASK *newAlocation;
DWORD i;
SkinSelector_DeleteMask(&(mmTemplateList->pl_Masks[mID]));
newAlocation = (MODERNMASK *)mir_alloc(sizeof(MODERNMASK)*mmTemplateList->dwMaskCnt-1);
@@ -404,7 +404,7 @@ static BOOL _GetParamValue( char * szText, unsigned int& start, unsigned int len return ( value || param );
}
-int ParseToModernMask(MODERNMASK * mm, char * szText)
+int ParseToModernMask(MODERNMASK *mm, char * szText)
{
if ( !mm || !szText) return -1;
@@ -459,7 +459,7 @@ int ParseToModernMask(MODERNMASK * mm, char * szText) return 0;
};
-BOOL CompareModernMask(MODERNMASK * mmValue,MODERNMASK * mmTemplate)
+BOOL CompareModernMask(MODERNMASK *mmValue,MODERNMASK *mmTemplate)
{
//TODO
BOOL res = TRUE;
@@ -501,7 +501,7 @@ BOOL CompareModernMask(MODERNMASK * mmValue,MODERNMASK * mmTemplate) return res;
};
-BOOL CompareStrWithModernMask(char * szValue,MODERNMASK * mmTemplate)
+BOOL CompareStrWithModernMask(char * szValue,MODERNMASK *mmTemplate)
{
MODERNMASK mmValue = {0};
int res;
@@ -530,13 +530,13 @@ int AddStrModernMaskToList(DWORD maskID, char * szStr, char * objectName, LISTM }
//Searching
-MODERNMASK * FindMaskByStr(char * szValue,LISTMODERNMASK * mmTemplateList)
+MODERNMASK * FindMaskByStr(char * szValue,LISTMODERNMASK * mmTemplateList)
{
//TODO
return NULL;
}
-SKINOBJECTDESCRIPTOR * skin_FindObjectByMask (MODERNMASK * mm,LISTMODERNMASK * mmTemplateList)
+SKINOBJECTDESCRIPTOR * skin_FindObjectByMask (MODERNMASK *mm,LISTMODERNMASK * mmTemplateList)
{
SKINOBJECTDESCRIPTOR * res = NULL;
DWORD i=0;
@@ -756,7 +756,7 @@ int RegisterObjectByParce(char * ObjectName, char * Params) }
-int SkinDrawGlyphMask(HDC hdc, RECT * rcSize, RECT * rcClip, MODERNMASK * ModernMask)
+int SkinDrawGlyphMask(HDC hdc, RECT *rcSize, RECT *rcClip, MODERNMASK *ModernMask)
{
if ( !ModernMask) return 0;
@@ -769,7 +769,7 @@ int SkinDrawGlyphMask(HDC hdc, RECT * rcSize, RECT * rcClip, MODERNMASK * Modern }
-int __inline SkinDrawWindowBack(HWND hwndIn, HDC hdc, RECT * rcClip, char * objectID)
+int __inline SkinDrawWindowBack(HWND hwndIn, HDC hdc, RECT *rcClip, char * objectID)
{
SKINDRAWREQUEST rq;
POINT pt = {0};
diff --git a/plugins/Clist_modern/src/modern_statusbar.cpp b/plugins/Clist_modern/src/modern_statusbar.cpp index e0ed473040..c603fc9e76 100644 --- a/plugins/Clist_modern/src/modern_statusbar.cpp +++ b/plugins/Clist_modern/src/modern_statusbar.cpp @@ -142,7 +142,7 @@ int BgStatusBarChange(WPARAM wParam,LPARAM lParam) }
//ProtocolData;
-int NewStatusPaintCallbackProc(HWND hWnd, HDC hDC, RECT * rcPaint, HRGN rgn, DWORD dFlags, void * CallBackData)
+int NewStatusPaintCallbackProc(HWND hWnd, HDC hDC, RECT *rcPaint, HRGN rgn, DWORD dFlags, void * CallBackData)
{
return ModernDrawStatusBar(hWnd,hDC);
}
diff --git a/plugins/Clist_modern/src/modern_tbbutton.cpp b/plugins/Clist_modern/src/modern_tbbutton.cpp index 448c01ea66..796697fc87 100644 --- a/plugins/Clist_modern/src/modern_tbbutton.cpp +++ b/plugins/Clist_modern/src/modern_tbbutton.cpp @@ -46,7 +46,7 @@ static int OnIconLibIconChanged(WPARAM wParam, LPARAM lParam) return 0;
}
-static void InvalidateParentRect(HWND hwndChild, RECT * lpRect, BOOL fErase)
+static void InvalidateParentRect(HWND hwndChild, RECT *lpRect, BOOL fErase)
{
LONG lExStyle = GetWindowLongPtr(hwndChild,GWL_EXSTYLE);
if (lExStyle & WS_EX_TRANSPARENT) {
diff --git a/plugins/Clist_modern/src/modern_toolbar.cpp b/plugins/Clist_modern/src/modern_toolbar.cpp index 7a0c0d741f..b5318994ec 100644 --- a/plugins/Clist_modern/src/modern_toolbar.cpp +++ b/plugins/Clist_modern/src/modern_toolbar.cpp @@ -153,7 +153,7 @@ static int ehhToolBarBackgroundSettingsChanged(WPARAM wParam, LPARAM lParam) return 0;
}
-static BOOL sttDrawToolBarBackground(HWND hwnd, HDC hdc, RECT * rect, ModernToolbarCtrl* pMTBInfo)
+static BOOL sttDrawToolBarBackground(HWND hwnd, HDC hdc, RECT *rect, ModernToolbarCtrl* pMTBInfo)
{
BOOL bFloat = (GetParent(hwnd)!=pcli->hwndContactList);
if (g_CluiData.fDisableSkinEngine || !g_CluiData.fLayered || bFloat) {
diff --git a/plugins/Clist_modern/src/modern_viewmodebar.cpp b/plugins/Clist_modern/src/modern_viewmodebar.cpp index c4ce59712d..2bf9ae8666 100644 --- a/plugins/Clist_modern/src/modern_viewmodebar.cpp +++ b/plugins/Clist_modern/src/modern_viewmodebar.cpp @@ -59,7 +59,7 @@ static UINT _page2Controls[] = {IDC_CLIST, IDC_STATIC9, IDC_STATIC8, IDC_CLEARAL void ApplyViewMode(const char *Name, bool onlySelector = false );
static UINT _buttons[] = {IDC_RESETMODES, IDC_SELECTMODE, IDC_CONFIGUREMODES, 0};
-static BOOL sttDrawViewModeBackground(HWND hwnd, HDC hdc, RECT * rect);
+static BOOL sttDrawViewModeBackground(HWND hwnd, HDC hdc, RECT *rect);
static void DeleteViewMode( char * szName );
static int DrawViewModeBar(HWND hWnd, HDC hDC)
@@ -70,7 +70,7 @@ static int DrawViewModeBar(HWND hWnd, HDC hDC) return 0;
}
-static int ViewModePaintCallbackProc(HWND hWnd, HDC hDC, RECT * rcPaint, HRGN rgn, DWORD dFlags, void * CallBackData)
+static int ViewModePaintCallbackProc(HWND hWnd, HDC hDC, RECT *rcPaint, HRGN rgn, DWORD dFlags, void * CallBackData)
{
int i;
RECT MyRect = {0};
@@ -1268,7 +1268,7 @@ struct view_mode_t static view_mode_t view_mode;
-static BOOL sttDrawViewModeBackground(HWND hwnd, HDC hdc, RECT * rect)
+static BOOL sttDrawViewModeBackground(HWND hwnd, HDC hdc, RECT *rect)
{
BOOL bFloat = (GetParent(hwnd) != pcli->hwndContactList);
if (g_CluiData.fDisableSkinEngine || !g_CluiData.fLayered || bFloat)
@@ -1469,7 +1469,7 @@ void ApplyViewMode(const char *Name, bool onlySelector ) g_CluiData.bSortByOrder[0] = SORTBY_LASTMSG;
for (i=0; i < clistCache->realCount; i++)
{
- PDNCE pdnce = (PDNCE)clistCache->items[i];
+ ClcCacheEntry *pdnce = (ClcCacheEntry *)clistCache->items[i];
pdnce->dwLastMsgTime = CompareContacts2_getLMTime(pdnce->hContact);
}
g_CluiData.bSortByOrder[0] = bSaved;
diff --git a/plugins/Clist_modern/src/modern_xptheme.cpp b/plugins/Clist_modern/src/modern_xptheme.cpp index 0e1e9dddde..91efe22898 100644 --- a/plugins/Clist_modern/src/modern_xptheme.cpp +++ b/plugins/Clist_modern/src/modern_xptheme.cpp @@ -197,7 +197,7 @@ void xpt_OnWM_THEMECHANGED() }
xptunlock();
}
-HRESULT xpt_DrawThemeBackground(XPTHANDLE xptHandle, HDC hdc, int type, int state, const RECT * sizeRect, const RECT * clipRect)
+HRESULT xpt_DrawThemeBackground(XPTHANDLE xptHandle, HDC hdc, int type, int state, const RECT *sizeRect, const RECT *clipRect)
{
HRESULT res = S_FALSE;
xptcheck S_FALSE;
@@ -207,7 +207,7 @@ HRESULT xpt_DrawThemeBackground(XPTHANDLE xptHandle, HDC hdc, int type, int stat xptunlock();
return res;
}
-HRESULT xpt_DrawThemeParentBackground(HWND hWnd, HDC hdc, const RECT * sizeRect)
+HRESULT xpt_DrawThemeParentBackground(HWND hWnd, HDC hdc, const RECT *sizeRect)
{
xptcheck S_FALSE;
return xpt_DrawThemeParentBackground(hWnd, hdc, sizeRect);
@@ -222,7 +222,7 @@ BOOL xpt_IsThemeBackgroundPartiallyTransparent(XPTHANDLE xptHandle, int type, i xptunlock();
return res;
}
-HRESULT xpt_DrawTheme(XPTHANDLE xptHandle, HWND hwnd, HDC hdc, int type, int state, const RECT *sizeRect, const RECT * clipRect)
+HRESULT xpt_DrawTheme(XPTHANDLE xptHandle, HWND hwnd, HDC hdc, int type, int state, const RECT *sizeRect, const RECT *clipRect)
{
HRESULT res = S_FALSE;
xptcheck S_FALSE;
@@ -237,7 +237,7 @@ HRESULT xpt_DrawTheme(XPTHANDLE xptHandle, HWND hwnd, HDC hdc, int type, int sta return res;
}
-HRESULT xpt_DrawThemeText(XPTHANDLE xptHandle, HDC hdc, int type, int state, LPCTSTR lpStr, int len, DWORD flag1, DWORD flag2, const RECT * textRect)
+HRESULT xpt_DrawThemeText(XPTHANDLE xptHandle, HDC hdc, int type, int state, LPCTSTR lpStr, int len, DWORD flag1, DWORD flag2, const RECT *textRect)
{
HRESULT res = S_FALSE;
xptcheck S_FALSE;
|