CLIST_INTERFACE::pfnCalcEipPosition => Clist_CalcEipPosition

11 files changed, 40 insertions, 39 deletions

diff --git a/include/delphi/m_clistint.inc b/include/delphi/m_clistint.inc
index 304c3ccc27..a9cb0ea06e 100644
--- a/include/delphi/m_clistint.inc
+++ b/include/delphi/m_clistint.inc
@@ -350,8 +350,8 @@ type
     pfnEndRename                       : procedure (hwnd:HWND; var dat:TClcData; save:int); cdecl;

     pfnDeleteFromContactList           : procedure (hwnd:HWND; var dat:TClcData); cdecl;

     pfnBeginRenameSelection            : procedure (hwnd:HWND; var dat:TClcData); cdecl;

-    pfnCalcEipPosition                 : procedure (var dat:TClcData; var contact:TClcContact; var group:TClcGroup; var result:TPOINT); cdecl;

-    pfnGetDropTargetInformation        : function  (hwnd:HWND; var dat:TClcData; pt:TPOINT):int; cdecl;

+    blablablabla14                     : procedure; cdecl;

+    blablablabla13                     : procedure; cdecl;

     blablablabla12                     : procedure; cdecl;

     blablablabla11                     : procedure; cdecl;

     blablablabla10                     : procedure; cdecl;

diff --git a/include/m_clistint.h b/include/m_clistint.h
index ce55efb849..f86d64f6f5 100644
--- a/include/m_clistint.h
+++ b/include/m_clistint.h
@@ -258,6 +258,7 @@ EXTERN_C MIR_APP_DLL(void)     Clist_DrawMenuItem(DRAWITEMSTRUCT *dis, HICON hIc
 EXTERN_C MIR_APP_DLL(int)      Clist_EventsProcessTrayDoubleClick(int index);

 EXTERN_C MIR_APP_DLL(bool)     Clist_FindItem(HWND hwnd, ClcData *dat, DWORD dwItem, ClcContact **contact, ClcGroup **subgroup, int *isVisible);

 EXTERN_C MIR_APP_DLL(DWORD)    Clist_GetDefaultExStyle(void);

+EXTERN_C MIR_APP_DLL(void)     Clist_CalcEipPosition(ClcData *dat, ClcContact *contact, ClcGroup *group, POINT *result);

 EXTERN_C MIR_APP_DLL(void)     Clist_GetFontSetting(int i, LOGFONT *lf, COLORREF *colour);

 EXTERN_C MIR_APP_DLL(void)     Clist_HideInfoTip(ClcData *dat);

 EXTERN_C MIR_APP_DLL(void)     Clist_InitAutoRebuild(HWND hWnd);

@@ -366,8 +367,8 @@ struct CLIST_INTERFACE
 	void           (*pfnEndRename)(HWND hwnd, ClcData *dat, int save);

 	void           (*pfnDeleteFromContactList)(HWND hwnd, ClcData *dat);

 	void           (*pfnBeginRenameSelection)(HWND hwnd, ClcData *dat);

-	void           (*pfnCalcEipPosition)(ClcData *dat, ClcContact *contact, ClcGroup *group, POINT *result);

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

+	void           (*blablablabla14)();

+	void           (*blablablabla13)();

 	void           (*blablablabla12)();

 	void           (*blablablabla11)();

 	void           (*blablablabla10)();

diff --git a/libs/win32/mir_app.lib b/libs/win32/mir_app.lib
index 59cfd96df3..6bb497fb9f 100644
--- a/libs/win32/mir_app.lib
+++ b/libs/win32/mir_app.lib
diff --git a/libs/win64/mir_app.lib b/libs/win64/mir_app.lib
index cdf56b01b8..b332c8db6b 100644
--- a/libs/win64/mir_app.lib
+++ b/libs/win64/mir_app.lib
diff --git a/plugins/Clist_modern/src/modern_clcutils.cpp b/plugins/Clist_modern/src/modern_clcutils.cpp
index 569fcb660b..95382bf70b 100644
--- a/plugins/Clist_modern/src/modern_clcutils.cpp
+++ b/plugins/Clist_modern/src/modern_clcutils.cpp
@@ -256,7 +256,7 @@ void cliBeginRenameSelection(HWND hwnd, ClcData *dat)
 	GetClientRect(hwnd, &clRect);

 

 	POINT pt;

-	pcli->pfnCalcEipPosition(dat, contact, group, &pt);

+	Clist_CalcEipPosition(dat, contact, group, &pt);

 

 	int x = pt.x + subindent, y = pt.y;

 	int w = clRect.right - x;

diff --git a/src/mir_app/src/clc.cpp b/src/mir_app/src/clc.cpp
index 70366defc4..7f51e96655 100644
--- a/src/mir_app/src/clc.cpp
+++ b/src/mir_app/src/clc.cpp
@@ -1016,7 +1016,7 @@ LRESULT CALLBACK fnContactListControlWndProc(HWND hwnd, UINT uMsg, WPARAM wParam
 				KillTimer(hwnd, TIMERID_DRAGAUTOSCROLL);

 				dat->dragAutoScrolling = 0;

 			}

-			int target = cli.pfnGetDropTargetInformation(hwnd, dat, pt);

+			int target = GetDropTargetInformation(hwnd, dat, pt);

 			if (dat->dragStage & DRAGSTAGEF_OUTSIDE && target != DROPTARGET_OUTSIDE) {

 				cli.pfnGetRowByIndex(dat, dat->iDragItem, &contact, nullptr);

 

@@ -1094,7 +1094,7 @@ LRESULT CALLBACK fnContactListControlWndProc(HWND hwnd, UINT uMsg, WPARAM wParam
 			SetTimer(hwnd, TIMERID_RENAME, GetDoubleClickTime(), nullptr);

 		else if ((dat->dragStage & DRAGSTAGEM_STAGE) == DRAGSTAGE_ACTIVE) {

 			POINT pt = { LOWORD(lParam), HIWORD(lParam) };

-			int target = cli.pfnGetDropTargetInformation(hwnd, dat, pt);

+			int target = GetDropTargetInformation(hwnd, dat, pt);

 			switch (target) {

 			case DROPTARGET_ONSELF:

 			case DROPTARGET_ONCONTACT:

diff --git a/src/mir_app/src/clc.h b/src/mir_app/src/clc.h
index 79c4213627..aaad1821d6 100644
--- a/src/mir_app/src/clc.h
+++ b/src/mir_app/src/clc.h
@@ -48,56 +48,56 @@ LRESULT CALLBACK fnContactListControlWndProc(HWND hwnd, UINT msg, WPARAM wParam,
 

 /* clcidents.c */

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

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

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

 

 ClcContact* fnFindItem(DWORD dwItem, ClcContact *contact);

 

 /* clcitems.c */

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

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

 ClcGroup* fnRemoveItemFromGroup(HWND hwnd, ClcGroup *group, ClcContact *contact, int updateTotalCount);

 

 ClcContact* fnAddInfoItemToGroup(ClcGroup *group, int flags, const wchar_t *pszText);

 ClcContact* fnAddItemToGroup(ClcGroup *group, int iAboveItem);

-ClcContact* fnAddContactToGroup(struct ClcData *dat, ClcGroup *group, MCONTACT hContact);

+ClcContact* fnAddContactToGroup(ClcData *dat, ClcGroup *group, MCONTACT hContact);

 

 void fnFreeContact(ClcContact *p);

 void fnFreeGroup(ClcGroup *group);

 

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

+void fnAddContactToTree(HWND hwnd, ClcData *dat, MCONTACT hContact, int updateTotalCount, int checkHideOffline);

 void fnDeleteItemFromTree(HWND hwnd, MCONTACT hItem);

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

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

 int  fnGetGroupContentsCount(ClcGroup *group, int visibleOnly);

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

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

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

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

 int  fnGetContactHiddenStatus(MCONTACT hContact, char *szProto, ClcData *dat);

 

 /* clcmsgs.c */

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

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

 

 /* clcutils.c */

-wchar_t* fnGetGroupCountsText(struct ClcData *dat, ClcContact *contact);

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

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

-void fnEnsureVisible(HWND hwnd, struct ClcData *dat, int iItem, int partialOk);

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

-void fnSetGroupExpand(HWND hwnd, struct ClcData *dat, ClcGroup *group, int newState);

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

-int  fnFindRowByText(HWND hwnd, struct ClcData *dat, const wchar_t *text, int prefixOk);

-void fnEndRename(HWND hwnd, struct ClcData *dat, int save);

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

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

-void fnCalcEipPosition(struct ClcData *dat, ClcContact *contact, ClcGroup *group, POINT *result);

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

+wchar_t* fnGetGroupCountsText(ClcData *dat, ClcContact *contact);

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

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

+void fnEnsureVisible(HWND hwnd, ClcData *dat, int iItem, int partialOk);

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

+void fnSetGroupExpand(HWND hwnd, ClcData *dat, ClcGroup *group, int newState);

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

+int  fnFindRowByText(HWND hwnd, ClcData *dat, const wchar_t *text, int prefixOk);

+void fnEndRename(HWND hwnd, ClcData *dat, int save);

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

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

 

 void fnGetDefaultFontSetting(int i, LOGFONT *lf, COLORREF *colour);

-void fnLoadClcOptions(HWND hwnd, struct ClcData *dat, BOOL bFirst);

+void fnLoadClcOptions(HWND hwnd, ClcData *dat, BOOL bFirst);

 void fnSetContactCheckboxes(ClcContact *cc, int checked);

 

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

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

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

-int fnGetRowTotalHeight(struct ClcData *dat);

-int fnRowHitTest(struct ClcData *dat, int y);

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

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

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

+int  fnGetRowTotalHeight(ClcData *dat);

+int  fnRowHitTest(ClcData *dat, int y);

+

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

 

 /* clcopts.c */

 int ClcOptInit(WPARAM wParam, LPARAM lParam);

diff --git a/src/mir_app/src/clcutils.cpp b/src/mir_app/src/clcutils.cpp
index 155b3c7588..db1c428865 100644
--- a/src/mir_app/src/clcutils.cpp
+++ b/src/mir_app/src/clcutils.cpp
@@ -512,7 +512,7 @@ void fnBeginRenameSelection(HWND hwnd, ClcData *dat)
 	GetClientRect(hwnd, &clRect);

 

 	POINT pt;

-	cli.pfnCalcEipPosition(dat, contact, group, &pt);

+	Clist_CalcEipPosition(dat, contact, group, &pt);

 	int h = cli.pfnGetRowHeight(dat, dat->selection);

 	dat->hwndRenameEdit = CreateWindow(L"EDIT", contact->szText, WS_CHILD | WS_BORDER | ES_AUTOHSCROLL, pt.x, pt.y, clRect.right - pt.x, h, hwnd, nullptr, cli.hInst, nullptr);

 	mir_subclassWindow(dat->hwndRenameEdit, RenameEditSubclassProc);

@@ -523,7 +523,7 @@ void fnBeginRenameSelection(HWND hwnd, ClcData *dat)
 	SetFocus(dat->hwndRenameEdit);

 }

 

-void fnCalcEipPosition(ClcData *dat, ClcContact *, ClcGroup *group, POINT *result)

+MIR_APP_DLL(void) Clist_CalcEipPosition(ClcData *dat, ClcContact *, ClcGroup *group, POINT *result)

 {

 	int indent;

 	for (indent = 0; group->parent; indent++, group = group->parent);

@@ -531,7 +531,7 @@ void fnCalcEipPosition(ClcData *dat, ClcContact *, ClcGroup *group, POINT *resul
 	result->y = cli.pfnGetRowTopY(dat, dat->selection) - dat->yScroll;

 }

 

-int fnGetDropTargetInformation(HWND hwnd, ClcData *dat, POINT pt)

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

 {

 	RECT clRect;

 	GetClientRect(hwnd, &clRect);

diff --git a/src/mir_app/src/clistcore.cpp b/src/mir_app/src/clistcore.cpp
index 42648aea79..ebc853fcf0 100644
--- a/src/mir_app/src/clistcore.cpp
+++ b/src/mir_app/src/clistcore.cpp
@@ -103,8 +103,6 @@ void InitClistCore()
 	cli.pfnEndRename = fnEndRename;

 	cli.pfnDeleteFromContactList = fnDeleteFromContactList;

 	cli.pfnBeginRenameSelection = fnBeginRenameSelection;

-	cli.pfnCalcEipPosition = fnCalcEipPosition;

-	cli.pfnGetDropTargetInformation = fnGetDropTargetInformation;

 

 	cli.pfnIsVisibleContact = fnIsVisibleContact;

 	cli.pfnGetDefaultFontSetting = fnGetDefaultFontSetting;

diff --git a/src/mir_app/src/mir_app.def b/src/mir_app/src/mir_app.def
index 2c91557298..34b277c764 100644
--- a/src/mir_app/src/mir_app.def
+++ b/src/mir_app/src/mir_app.def
@@ -566,3 +566,4 @@ Clist_NotifyNewContact @585
 Clist_HideInfoTip @586

 Clist_IsHiddenMode @587

 Clist_ClcStatusToPf2 @588

+Clist_CalcEipPosition @589

diff --git a/src/mir_app/src/mir_app64.def b/src/mir_app/src/mir_app64.def
index 9b43a20b1f..2d23da50be 100644
--- a/src/mir_app/src/mir_app64.def
+++ b/src/mir_app/src/mir_app64.def
@@ -566,3 +566,4 @@ Clist_NotifyNewContact @585
 Clist_HideInfoTip @586

 Clist_IsHiddenMode @587

 Clist_ClcStatusToPf2 @588

+Clist_CalcEipPosition @589