diff options
| -rw-r--r-- | include/delphi/m_clistint.inc | 133 | ||||
| -rw-r--r-- | include/m_clistint.h | 46 | ||||
| -rw-r--r-- | plugins/Clist_nicer/src/extBackg.cpp | 2 | ||||
| -rw-r--r-- | plugins/ExternalAPI/m_cln_skinedit.h | 2 |
4 files changed, 60 insertions, 123 deletions
diff --git a/include/delphi/m_clistint.inc b/include/delphi/m_clistint.inc index 119c2b40bb..d966dc78c8 100644 --- a/include/delphi/m_clistint.inc +++ b/include/delphi/m_clistint.inc @@ -297,113 +297,82 @@ type clcProto : PClcProtoStatus;
(* clc.h *)
- blablablabla27 : procedure; cdecl;
- blablablabla26 : procedure; cdecl;
-
pfnContactListControlWndProc : function(hwnd:HWND; msg:uint; wParam:WPARAM; lParam:LPARAM):LRESULT; stdcall;
- (* clcfiledrop.c *)
- blablablabla25 : procedure; cdecl;
- blablablabla24 : procedure; cdecl;
-
(* clcidents.c *)
- blablabla6 : procedure; cdecl;
+ pfnFindItem : procedure; cdecl;
- pfnGetRowsPriorTo : function (var group:TClcGroup; var subgroup:TClcGroup; contactIndex:int):int; cdecl;
- pfnGetRowByIndex : function (var dat:TClcData; testindex:int; var contact:PClcContact; var subgroup:PClcGroup):int; cdecl;
- unused1 : function (var contact:TClcContact):THANDLE;cdecl;
- unused2 : function (var contact:TClcContact; var nmFlags:dword):THANDLE; cdecl;
+ pfnGetRowsPriorTo : procedure; cdecl;
+ pfnGetRowByIndex : procedure; cdecl;
+ pfnGetContactHiddenStatus : procedure; cdecl;
+ pfnIsVisibleContact : procedure; cdecl;
(* clcitems.c *)
- pfnCreateClcContact : function :PClcContact; cdecl;
- pfnAddGroup : function (hwnd:HWND; var dat:TClcData; szName:TChar; flags:dword; groupId:int; calcTotalMembers:int):PClcGroup; cdecl;
- blablablabla23 : procedure; cdecl;
-
- pfnFreeContact : procedure (var contact:TClcContact); cdecl;
- blablablabla22 : procedure; cdecl;
-
- pfnAddInfoItemToGroup : function (var group:TClcGroup; flags:int; pszText:TChar):PClcContact; cdecl;
- pfnAddItemToGroup : function (var group:TClcGroup; iAboveItem:int):PClcContact; cdecl;
- pfnAddContactToGroup : function (var dat:TClcData; var group:TClcGroup; hContact:TMCONTACT):PClcContact; cdecl;
- pfnAddContactToTree : procedure (hwnd:HWND; var dat:TClcData; hContact:TMCONTACT; updateTotalCount:int; checkHideOffline:int); cdecl;
- blablablabla21 : procedure; cdecl;
- pfnRebuildEntireList : procedure (hwnd:HWND; var dat:TClcData); cdecl;
- pfnGetGroupContentsCount : function (var group:TClcGroup; visibleOnly:int):int; cdecl;
- pfnSortCLC : procedure (hwnd:HWND; var dat:TClcData; useInsertionSort:int); cdecl;
- blablablabla20 : procedure; cdecl;
+ pfnCreateClcContact : procedure; cdecl;
+ pfnAddGroup : procedure; cdecl;
+
+ pfnFreeContact : procedure; cdecl;
+
+ pfnAddInfoItemToGroup : procedure; cdecl;
+ pfnAddItemToGroup : procedure; cdecl;
+ pfnAddContactToGroup : procedure; cdecl;
+
+ pfnAddContactToTree : procedure; cdecl;
+ pfnRebuildEntireList : procedure; cdecl;
+ pfnGetGroupContentsCount : procedure; cdecl;
+ pfnSortCLC : procedure; cdecl;
(* clcmsgs.c *)
- pfnProcessExternalMessages : function (hwnd:HWND; var dat:TClcData; msg:uint; wParam:WPARAM; lParam:LPARAM):LRESULT; cdecl;
+ pfnProcessExternalMessages : procedure; cdecl;
(* clcpaint.c *)
- pfnPaintClc : procedure (hwnd:HWND; var dat:TClcData; hdc:HDC; var rcPaint:TRECT); cdecl;
+ pfnPaintClc : procedure; cdecl;
(* clcutils.c *)
- blablablabla19 : procedure; cdecl;
- pfnHitTest : function (hwnd:HWND; var dat:TClcData; testx:int; testy:int; var contact:PClcContact; var group:PClcGroup; var flags:dword):int; cdecl;
- pfnScrollTo : procedure (hwnd:HWND; var dat:TClcData; desty:int; noSmooth:int); cdecl;
- blablablabla18 : procedure; cdecl;
- pfnRecalcScrollBar : procedure (hwnd:HWND; var dat:TClcData); cdecl;
- pfnSetGroupExpand : procedure (hwnd:HWND; var dat:TClcData; var group:TClcGroup; newState:int); cdecl;
- blablablabla17 : procedure; cdecl;
- pfnFindRowByText : function (hwnd:HWND; var dat:TClcData; text:TChar; prefixOk:int):int; cdecl;
- blablablabla16 : procedure; cdecl;
- blablablabla15 : procedure; cdecl;
- pfnBeginRenameSelection : procedure (hwnd:HWND; var dat:TClcData); cdecl;
- blablablabla14 : procedure; cdecl;
- blablablabla13 : procedure; cdecl;
- blablablabla12 : procedure; cdecl;
- blablablabla11 : procedure; cdecl;
- blablablabla10 : procedure; cdecl;
- blablablabla9 : procedure; cdecl;
- blablablabla8 : procedure; cdecl;
- pfnGetDefaultFontSetting : procedure (i:int; var lf:LOGFONT; var colour:COLORREF); cdecl;
- pfnLoadClcOptions : procedure (hwnd:HWND; var dat:TClcData; bFirst: int); cdecl;
- blablablabla7 : procedure; cdecl;
- blablablabla6 : procedure; cdecl;
- blablablabla5 : procedure; cdecl;
- blablablabla4 : procedure; cdecl;
-
- pfnGetRowBottomY : function (var dat:TClcData; item:int):int; cdecl;
- pfnGetRowHeight : function (var dat:TClcData; item:int):int; cdecl;
- pfnGetRowTopY : function (var dat:TClcData; item:int):int; cdecl;
- pfnGetRowTotalHeight : function (var dat:TClcData):int; cdecl;
- pfnRowHitTest : function (var dat:TClcData; y:int):int; cdecl;
-
- (* clistevents.c *)
- blablablabla2 : procedure; cdecl;
- blablablabla3 : procedure; cdecl;
+ pfnHitTest : procedure; cdecl;
+ pfnScrollTo : procedure; cdecl;
+ pfnRecalcScrollBar : procedure; cdecl;
+ pfnSetGroupExpand : procedure; cdecl;
+ pfnFindRowByText : procedure; cdecl;
+ pfnBeginRenameSelection : procedure; cdecl;
+ pfnGetDefaultFontSetting : procedure; cdecl;
+ pfnLoadClcOptions : procedure; cdecl;
+
+ pfnGetRowBottomY : procedure; cdecl;
+ pfnGetRowHeight : procedure; cdecl;
+ pfnGetRowTopY : procedure; cdecl;
+ pfnGetRowTotalHeight : procedure; cdecl;
+ pfnRowHitTest : procedure; cdecl;
(* clistmod.c *)
pfnIconFromStatusMode : function (szProto:PAnsiChar; status:int; hContact:TMCONTACT):int; cdecl;
- pfnShowHide : function :int; cdecl;
+ pfnShowHide : procedure; cdecl;
(* clistsettings.c *)
- blablablabla1 : procedure; cdecl;
- pfnCreateCacheItem : function (hContact:TMCONTACT):PClcCacheEntry; cdecl;
- pfnCheckCacheItem : procedure (_para1:PClcCacheEntry); cdecl;
- pfnFreeCacheItem : procedure (_para1:PClcCacheEntry); cdecl;
+ pfnCreateCacheItem : procedure; cdecl;
+ pfnCheckCacheItem : procedure; cdecl;
+ pfnFreeCacheItem : procedure; cdecl;
- pfnInvalidateDisplayNameCacheEntry : procedure (hContact:TMCONTACT); cdecl;
+ pfnInvalidateDisplayNameCacheEntry : procedure; cdecl;
(* clisttray.c *)
- pfnTrayIconPauseAutoHide : function (wParam:WPARAM; lParam:LPARAM):int; cdecl;
- pfnTrayIconProcessMessage : function (wParam:WPARAM; lParam:LPARAM):int_ptr; cdecl;
+ pfnTrayIconPauseAutoHide : procedure; cdecl;
+ pfnTrayIconProcessMessage : procedure; cdecl;
(* clui.c *)
- pfnContactListWndProc : function(hwnd:HWND; msg:uint; wParam:WPARAM; lParam:LPARAM):int; stdcall;
+ pfnContactListWndProc : procedure; cdecl;
- pfnCluiProtocolStatusChanged : procedure (status:int; szProto:PAnsiChar); cdecl;
+ pfnCluiProtocolStatusChanged : procedure; cdecl;
pfnLoadCluiGlobalOpts : procedure; cdecl;
- pfnInvalidateRect : function (hwnd:HWND; var lpRect:TRECT; bErase:bool):bool; cdecl;
- pfnOnCreateClc : procedure ; cdecl;
+ pfnInvalidateRect : procedure; cdecl;
+ pfnOnCreateClc : procedure; cdecl;
(* contact.c *)
- pfnCompareContacts : function (var contact1:TClcContact; var contact2:TClcContact):int; cdecl;
- pfnSetHideOffline : function (wParam:WPARAM; lParam:LPARAM):int; cdecl;
+ pfnCompareContacts : procedure; cdecl;
+ pfnSetHideOffline : procedure; cdecl;
(* docking.c *)
- pfnDocking_ProcessWindowMessage : function (wParam:WPARAM; lParam:LPARAM):int; cdecl;
+ pfnDocking_ProcessWindowMessage : procedure; cdecl;
(*************************************************************************************
* version 2 - events processing
@@ -411,10 +380,10 @@ type events : PEventList;
- pfnAddEvent : function (_para1:PCLISTEVENT):PCListEvent; cdecl;
- pfnGetEvent : function (hContact:TMCONTACT; idx:int):PCLISTEVENT; cdecl;
+ pfnAddEvent : procedure; cdecl;
+ pfnGetEvent : procedure; cdecl;
- pfnRemoveEvent : function (hContact:TMCONTACT; hDbEvent:TMEVENT):int; cdecl;
+ pfnRemoveEvent : function (hContact:TMCONTACT; hDbEvent:TMEVENT):int; cdecl;
end;
function Clist_GetInterface : PCLIST_INTERFACE; stdcall; external AppDll;
diff --git a/include/m_clistint.h b/include/m_clistint.h index 94b4da6bf7..b06e57cbb9 100644 --- a/include/m_clistint.h +++ b/include/m_clistint.h @@ -321,17 +321,10 @@ struct CLIST_INTERFACE int hClcProtoCount;
ClcProtoStatus *clcProto;
- /* clc.h */
- void (*blablablabla27)();
- void (*blablablabla26)();
-
+ // clc.h
LRESULT (CALLBACK *pfnContactListControlWndProc)(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam);
- /* clcfiledrop.c */
- void (*blablablabla25)();
- void (*blablablabla24)();
-
- /* clcidents.c */
+ // clcidents.c
ClcContact* (*pfnFindItem)(DWORD dwItem, ClcContact *contact);
int (*pfnGetRowsPriorTo)(ClcGroup *group, ClcGroup *subgroup, int contactIndex);
@@ -342,21 +335,17 @@ struct CLIST_INTERFACE /* clcitems.c */
ClcContact* (*pfnCreateClcContact)(void);
ClcGroup* (*pfnAddGroup)(HWND hwnd, ClcData *dat, const wchar_t *szName, DWORD flags, int groupId, int calcTotalMembers);
- void (*blablablabla23)();
void (*pfnFreeContact)(ClcContact *contact);
- void (*blablablabla22)();
ClcContact* (*pfnAddInfoItemToGroup)(ClcGroup *group, int flags, const wchar_t *pszText);
ClcContact* (*pfnAddItemToGroup)(ClcGroup *group, int iAboveItem);
ClcContact* (*pfnAddContactToGroup)(ClcData *dat, ClcGroup *group, MCONTACT hContact);
void (*pfnAddContactToTree)(HWND hwnd, ClcData *dat, MCONTACT hContact, int updateTotalCount, int checkHideOffline);
- void (*blablablabla21)();
void (*pfnRebuildEntireList)(HWND hwnd, ClcData *dat);
int (*pfnGetGroupContentsCount)(ClcGroup *group, int visibleOnly);
void (*pfnSortCLC)(HWND hwnd, ClcData *dat, int useInsertionSort);
- void (*blablablabla20)();
/* clcmsgs.c */
LRESULT (*pfnProcessExternalMessages)(HWND hwnd, ClcData *dat, UINT msg, WPARAM wParam, LPARAM lParam);
@@ -365,30 +354,14 @@ struct CLIST_INTERFACE void (*pfnPaintClc)(HWND hwnd, ClcData *dat, HDC hdc, RECT * rcPaint);
/* clcutils.c */
- void (*blablablabla19)();
int (*pfnHitTest)(HWND hwnd, ClcData *dat, int testx, int testy, ClcContact **contact, ClcGroup **group, DWORD * flags);
void (*pfnScrollTo)(HWND hwnd, ClcData *dat, int desty, int noSmooth);
- void (*blablablabla18)();
void (*pfnRecalcScrollBar)(HWND hwnd, ClcData *dat);
void (*pfnSetGroupExpand)(HWND hwnd, ClcData *dat, ClcGroup *group, int newState);
- void (*blablablabla17)();
int (*pfnFindRowByText)(HWND hwnd, ClcData *dat, const wchar_t *text, int prefixOk);
- void (*blablablabla16)();
- void (*blablablabla15)();
void (*pfnBeginRenameSelection)(HWND hwnd, ClcData *dat);
- void (*blablablabla14)();
- void (*blablablabla13)();
- void (*blablablabla12)();
- void (*blablablabla11)();
- void (*blablablabla10)();
- void (*blablablabla9)();
- void (*blablablabla8)();
void (*pfnGetDefaultFontSetting)(int i, LOGFONT *lf, COLORREF *colour);
void (*pfnLoadClcOptions)(HWND hwnd, ClcData *dat, BOOL bFirst);
- void (*blablablabla7)();
- void (*blablablabla6)();
- void (*blablablabla5)();
- void (*blablablabla4)();
int (*pfnGetRowBottomY)(ClcData *dat, int item);
int (*pfnGetRowHeight)(ClcData *dat, int item);
@@ -396,16 +369,11 @@ struct CLIST_INTERFACE int (*pfnGetRowTotalHeight)(ClcData *dat);
int (*pfnRowHitTest)(ClcData *dat, int y);
- /* clistevents.c */
- void (*blablablabla2)();
- void (*blablablabla3)();
-
/* clistmod.c */
int (*pfnIconFromStatusMode)(const char *szProto, int status, MCONTACT hContact);
int (*pfnShowHide)(void);
/* clistsettings.c */
- void (*blablablabla1)();
ClcCacheEntry* (*pfnCreateCacheItem)(MCONTACT hContact);
void (*pfnCheckCacheItem)(ClcCacheEntry*);
void (*pfnFreeCacheItem)(ClcCacheEntry*);
@@ -437,17 +405,17 @@ struct CLIST_INTERFACE OBJLIST<CListEvent> *events;
- struct CListEvent* (*pfnAddEvent)(CLISTEVENT*);
- CLISTEVENT* (*pfnGetEvent)(MCONTACT hContact, int idx);
+ CListEvent* (*pfnAddEvent)(CLISTEVENT*);
+ CLISTEVENT* (*pfnGetEvent)(MCONTACT hContact, int idx);
- int (*pfnRemoveEvent)(MCONTACT hContact, MEVENT hDbEvent);
- int (*pfnGetImlIconIndex)(HICON hIcon);
+ int (*pfnRemoveEvent)(MCONTACT hContact, MEVENT hDbEvent);
+ int (*pfnGetImlIconIndex)(HICON hIcon);
/*************************************************************************************
* version 3 additions
*************************************************************************************/
- int (*pfnGetWindowVisibleState)(HWND hWnd, int iStepX, int iStepY);
+ int (*pfnGetWindowVisibleState)(HWND hWnd, int iStepX, int iStepY);
/*************************************************************************************
* version 4 additions (0.7.0.x) - genmenu
diff --git a/plugins/Clist_nicer/src/extBackg.cpp b/plugins/Clist_nicer/src/extBackg.cpp index f9b5b457d1..83064a0ccc 100644 --- a/plugins/Clist_nicer/src/extBackg.cpp +++ b/plugins/Clist_nicer/src/extBackg.cpp @@ -1653,7 +1653,7 @@ INT_PTR CALLBACK OptionsDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPara sd.pfnSaveCompleteStruct = SaveCompleteStructToDB;
sd.lastItem = ID_STATUS_OFFLINE + arStatusItems.getCount();
sd.firstItem = ID_STATUS_OFFLINE;
- sd.pfnClcOptionsChanged = Clist_ClcOptionsChanged;
+ sd.pfnClcOptionsChanged = &Clist_ClcOptionsChanged;
sd.hwndCLUI = pcli->hwndContactList;
hwndSkinEdit = (HWND)CallService(MS_CLNSE_INVOKE, 0, (LPARAM)&sd);
}
diff --git a/plugins/ExternalAPI/m_cln_skinedit.h b/plugins/ExternalAPI/m_cln_skinedit.h index c5c9d49585..0255c98080 100644 --- a/plugins/ExternalAPI/m_cln_skinedit.h +++ b/plugins/ExternalAPI/m_cln_skinedit.h @@ -104,7 +104,7 @@ typedef struct _tagSkinDescription { HWND hwndImageEdit; /* out param */
HMENU hMenuItems;
void (*pfnSaveCompleteStruct)(void);
- void (*pfnClcOptionsChanged )(void);
+ void (CALLBACK *pfnClcOptionsChanged )(void);
void* (*pfnMalloc)(unsigned int);
void (*pfnFree)(void);
void* (*pfnRealloc)(void *, unsigned int);
|