CLIST_INTERFACE::pfnEndRename => Clist_EndRename

16 files changed, 33 insertions, 26 deletions

diff --git a/include/delphi/m_clistint.inc b/include/delphi/m_clistint.inc
index d54098f610..29ee1ae27d 100644
--- a/include/delphi/m_clistint.inc
+++ b/include/delphi/m_clistint.inc
@@ -347,7 +347,7 @@ type
     pfnSetGroupExpand                  : procedure (hwnd:HWND; var dat:TClcData; var group:TClcGroup; newState:int); cdecl;

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

     pfnFindRowByText                   : function  (hwnd:HWND; var dat:TClcData; text:TChar; prefixOk:int):int; cdecl;

-    pfnEndRename                       : procedure (hwnd:HWND; var dat:TClcData; save:int); cdecl;

+    blablablabla16                     : procedure; cdecl;

     blablablabla15                     : procedure; cdecl;

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

     blablablabla14                     : procedure; cdecl;

diff --git a/include/m_clistint.h b/include/m_clistint.h
index 6fd8a435a4..6b692e442b 100644
--- a/include/m_clistint.h
+++ b/include/m_clistint.h
@@ -256,6 +256,7 @@ EXTERN_C MIR_APP_DLL(void)     Clist_ChangeContactIcon(MCONTACT hContact, int iI
 EXTERN_C MIR_APP_DLL(int)      Clist_ClcStatusToPf2(int status);

 EXTERN_C MIR_APP_DLL(void)     Clist_DeleteFromContactList(HWND hwnd, ClcData *dat);

 EXTERN_C MIR_APP_DLL(void)     Clist_DrawMenuItem(DRAWITEMSTRUCT *dis, HICON hIcon, HICON eventIcon);

+EXTERN_C MIR_APP_DLL(void)     Clist_EndRename(ClcData *dat, int save);

 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);

@@ -365,7 +366,7 @@ struct CLIST_INTERFACE
 	void           (*pfnSetGroupExpand)(HWND hwnd, ClcData *dat, ClcGroup *group, int newState);

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

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

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

+	void           (*blablablabla16)();

 	void           (*blablablabla15)();

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

 	void           (*blablablabla14)();

diff --git a/libs/win32/mir_app.lib b/libs/win32/mir_app.lib
index 83b0f07529..7a204de94a 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 724c17b4fd..9c1fac0364 100644
--- a/libs/win64/mir_app.lib
+++ b/libs/win64/mir_app.lib
diff --git a/plugins/Clist_modern/src/modern_clc.cpp b/plugins/Clist_modern/src/modern_clc.cpp
index 8bbd3bb437..25afd153fe 100644
--- a/plugins/Clist_modern/src/modern_clc.cpp
+++ b/plugins/Clist_modern/src/modern_clc.cpp
@@ -328,7 +328,7 @@ static LRESULT clcOnCommand(ClcData *dat, HWND hwnd, UINT, WPARAM wParam, LPARAM
 

 static LRESULT clcOnSize(ClcData *dat, HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)

 {

-	pcli->pfnEndRename(hwnd, dat, 1);

+	Clist_EndRename(dat, 1);

 	KillTimer(hwnd, TIMERID_INFOTIP);

 	KillTimer(hwnd, TIMERID_RENAME);

 	cliRecalcScrollBar(hwnd, dat);

@@ -699,7 +699,7 @@ static LRESULT clcOnLButtonDown(ClcData *dat, HWND hwnd, UINT, WPARAM, LPARAM lP
 	KillTimer(hwnd, TIMERID_RENAME);

 	KillTimer(hwnd, TIMERID_SUBEXPAND);

 

-	pcli->pfnEndRename(hwnd, dat, 1);

+	Clist_EndRename(dat, 1);

 	dat->ptDragStart.x = (short)LOWORD(lParam);

 	dat->ptDragStart.y = (short)HIWORD(lParam);

 

diff --git a/plugins/Clist_modern/src/modern_clcutils.cpp b/plugins/Clist_modern/src/modern_clcutils.cpp
index 95382bf70b..04498d6ab0 100644
--- a/plugins/Clist_modern/src/modern_clcutils.cpp
+++ b/plugins/Clist_modern/src/modern_clcutils.cpp
@@ -216,13 +216,14 @@ static LRESULT CALLBACK RenameEditSubclassProc(HWND hwnd, UINT uMsg, WPARAM wPar
 	case WM_KEYDOWN:

 		switch (wParam) {

 		case VK_RETURN:

-			pcli->pfnEndRename(GetParent(hwnd), (ClcData*)GetWindowLongPtr(hwnd, GWLP_USERDATA), 1);

+			Clist_EndRename((ClcData*)GetWindowLongPtr(hwnd, GWLP_USERDATA), 1);

 			return 0;

 		case VK_ESCAPE:

-			pcli->pfnEndRename(GetParent(hwnd), (ClcData*)GetWindowLongPtr(hwnd, GWLP_USERDATA), 0);

+			Clist_EndRename((ClcData*)GetWindowLongPtr(hwnd, GWLP_USERDATA), 0);

 			return 0;

 		}

 		break;

+	

 	case WM_GETDLGCODE:

 		if (lParam) {

 			MSG *msg = (MSG*)lParam;

@@ -230,8 +231,9 @@ static LRESULT CALLBACK RenameEditSubclassProc(HWND hwnd, UINT uMsg, WPARAM wPar
 			if (msg->message == WM_CHAR && msg->wParam == '\t') return 0;

 		}

 		return DLGC_WANTMESSAGE;

+	

 	case WM_KILLFOCUS:

-		pcli->pfnEndRename(GetParent(hwnd), (ClcData*)GetWindowLongPtr(hwnd, GWLP_USERDATA), 1);

+		Clist_EndRename((ClcData*)GetWindowLongPtr(hwnd, GWLP_USERDATA), 1);

 		SendMessage(pcli->hwndContactTree, WM_SIZE, 0, 0);

 		return 0;

 	}

diff --git a/plugins/Clist_nicer/src/clc.cpp b/plugins/Clist_nicer/src/clc.cpp
index 89928963a2..51f00bb68d 100644
--- a/plugins/Clist_nicer/src/clc.cpp
+++ b/plugins/Clist_nicer/src/clc.cpp
@@ -256,7 +256,7 @@ LRESULT CALLBACK ContactListControlWndProc(HWND hwnd, UINT msg, WPARAM wParam, L
 		break;

 

 	case WM_SIZE:

-		pcli->pfnEndRename(hwnd, dat, 1);

+		Clist_EndRename(dat, 1);

 		KillTimer(hwnd, TIMERID_INFOTIP);

 		KillTimer(hwnd, TIMERID_RENAME);

 		pcli->pfnRecalcScrollBar(hwnd, dat);

@@ -632,7 +632,7 @@ LRESULT CALLBACK ContactListControlWndProc(HWND hwnd, UINT msg, WPARAM wParam, L
 		return TRUE;

 

 	case WM_CONTEXTMENU:

-		pcli->pfnEndRename(hwnd, dat, 1);

+		Clist_EndRename(dat, 1);

 		Clist_HideInfoTip(dat);

 		KillTimer(hwnd, TIMERID_RENAME);

 		KillTimer(hwnd, TIMERID_INFOTIP);

diff --git a/plugins/Clist_nicer/src/clcutils.cpp b/plugins/Clist_nicer/src/clcutils.cpp
index 5822512dbe..82e9722c2f 100644
--- a/plugins/Clist_nicer/src/clcutils.cpp
+++ b/plugins/Clist_nicer/src/clcutils.cpp
@@ -483,13 +483,14 @@ static LRESULT CALLBACK RenameEditSubclassProc(HWND hwnd, UINT uMsg, WPARAM wPar
 	case WM_KEYDOWN:

 		switch (wParam) {

 		case VK_RETURN:

-			pcli->pfnEndRename(GetParent(hwnd), (ClcData*)GetWindowLongPtr(GetParent(hwnd), 0), 1);

+			Clist_EndRename((ClcData*)GetWindowLongPtr(GetParent(hwnd), 0), 1);

 			return 0;

 		case VK_ESCAPE:

-			pcli->pfnEndRename(GetParent(hwnd), (ClcData*)GetWindowLongPtr(GetParent(hwnd), 0), 0);

+			Clist_EndRename((ClcData*)GetWindowLongPtr(GetParent(hwnd), 0), 0);

 			return 0;

 		}

 		break;

+	

 	case WM_GETDLGCODE:

 		if (lParam) {

 			MSG *msg = (MSG *)lParam;

@@ -499,8 +500,9 @@ static LRESULT CALLBACK RenameEditSubclassProc(HWND hwnd, UINT uMsg, WPARAM wPar
 				return 0;

 		}

 		return DLGC_WANTMESSAGE;

+	

 	case WM_KILLFOCUS:

-		pcli->pfnEndRename(GetParent(hwnd), (ClcData*)GetWindowLongPtr(GetParent(hwnd), 0), 1);

+		Clist_EndRename((ClcData*)GetWindowLongPtr(GetParent(hwnd), 0), 1);

 		return 0;

 	}

 	return mir_callNextSubclass(hwnd, RenameEditSubclassProc, uMsg, wParam, lParam);

diff --git a/src/mir_app/src/clc.cpp b/src/mir_app/src/clc.cpp
index a39309ef12..d1a0c27f72 100644
--- a/src/mir_app/src/clc.cpp
+++ b/src/mir_app/src/clc.cpp
@@ -307,7 +307,7 @@ LRESULT CALLBACK fnContactListControlWndProc(HWND hwnd, UINT uMsg, WPARAM wParam
 		break;

 

 	case WM_SIZE:

-		cli.pfnEndRename(hwnd, dat, 1);

+		Clist_EndRename(dat, 1);

 		KillTimer(hwnd, TIMERID_INFOTIP);

 		KillTimer(hwnd, TIMERID_RENAME);

 		cli.pfnRecalcScrollBar(hwnd, dat);

@@ -646,7 +646,7 @@ LRESULT CALLBACK fnContactListControlWndProc(HWND hwnd, UINT uMsg, WPARAM wParam
 		break;

 

 	case WM_VSCROLL:

-		cli.pfnEndRename(hwnd, dat, 1);

+		Clist_EndRename(dat, 1);

 		Clist_HideInfoTip(dat);

 		KillTimer(hwnd, TIMERID_INFOTIP);

 		KillTimer(hwnd, TIMERID_RENAME);

@@ -670,7 +670,7 @@ LRESULT CALLBACK fnContactListControlWndProc(HWND hwnd, UINT uMsg, WPARAM wParam
 		break;

 

 	case WM_MOUSEWHEEL:

-		cli.pfnEndRename(hwnd, dat, 1);

+		Clist_EndRename(dat, 1);

 		Clist_HideInfoTip(dat);

 		KillTimer(hwnd, TIMERID_INFOTIP);

 		KillTimer(hwnd, TIMERID_RENAME);

@@ -810,7 +810,7 @@ LRESULT CALLBACK fnContactListControlWndProc(HWND hwnd, UINT uMsg, WPARAM wParam
 		break;

 

 	case WM_SYSKEYDOWN:

-		cli.pfnEndRename(hwnd, dat, 1);

+		Clist_EndRename(dat, 1);

 		Clist_HideInfoTip(dat);

 		KillTimer(hwnd, TIMERID_INFOTIP);

 		KillTimer(hwnd, TIMERID_RENAME);

@@ -893,7 +893,7 @@ LRESULT CALLBACK fnContactListControlWndProc(HWND hwnd, UINT uMsg, WPARAM wParam
 		Clist_HideInfoTip(dat);

 		KillTimer(hwnd, TIMERID_INFOTIP);

 		KillTimer(hwnd, TIMERID_RENAME);

-		cli.pfnEndRename(hwnd, dat, 1);

+		Clist_EndRename(dat, 1);

 		dat->ptDragStart.x = (short)LOWORD(lParam);

 		dat->ptDragStart.y = (short)HIWORD(lParam);

 		if (!dat->bFilterSearch)

@@ -1180,7 +1180,7 @@ LRESULT CALLBACK fnContactListControlWndProc(HWND hwnd, UINT uMsg, WPARAM wParam
 		break;

 

 	case WM_CONTEXTMENU:

-		cli.pfnEndRename(hwnd, dat, 1);

+		Clist_EndRename(dat, 1);

 		Clist_HideInfoTip(dat);

 		KillTimer(hwnd, TIMERID_RENAME);

 		KillTimer(hwnd, TIMERID_INFOTIP);

diff --git a/src/mir_app/src/clc.h b/src/mir_app/src/clc.h
index 3889fd56aa..b1dcc58dc2 100644
--- a/src/mir_app/src/clc.h
+++ b/src/mir_app/src/clc.h
@@ -83,7 +83,6 @@ 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 fnBeginRenameSelection(HWND hwnd, ClcData *dat);

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

diff --git a/src/mir_app/src/clcitems.cpp b/src/mir_app/src/clcitems.cpp
index d43373dc82..0ab68940a7 100644
--- a/src/mir_app/src/clcitems.cpp
+++ b/src/mir_app/src/clcitems.cpp
@@ -616,7 +616,7 @@ void fnSaveStateAndRebuildList(HWND hwnd, ClcData *dat)
 	Clist_HideInfoTip(dat);
 	KillTimer(hwnd, TIMERID_INFOTIP);
 	KillTimer(hwnd, TIMERID_RENAME);
-	cli.pfnEndRename(hwnd, dat, 1);
+	Clist_EndRename(dat, 1);
 
 	dat->bLockScrollbar = true;
 
diff --git a/src/mir_app/src/clcmsgs.cpp b/src/mir_app/src/clcmsgs.cpp
index 892cc014b7..c13bf9924a 100644
--- a/src/mir_app/src/clcmsgs.cpp
+++ b/src/mir_app/src/clcmsgs.cpp
@@ -92,7 +92,7 @@ LRESULT fnProcessExternalMessages(HWND hwnd, ClcData *dat, UINT msg, WPARAM wPar
 		break;

 

 	case CLM_ENDEDITLABELNOW:

-		cli.pfnEndRename(hwnd, dat, wParam);

+		Clist_EndRename(dat, wParam);

 		break;

 

 	case CLM_ENSUREVISIBLE:

diff --git a/src/mir_app/src/clcutils.cpp b/src/mir_app/src/clcutils.cpp
index 79ed8b3af9..3087ea488e 100644
--- a/src/mir_app/src/clcutils.cpp
+++ b/src/mir_app/src/clcutils.cpp
@@ -410,7 +410,7 @@ int fnFindRowByText(HWND hwnd, ClcData *dat, const wchar_t *text, int prefixOk)
 	return -1;

 }

 

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

+MIR_APP_DLL(void) Clist_EndRename(ClcData *dat, int save)

 {

 	HWND hwndEdit = dat->hwndRenameEdit;

 	if (hwndEdit == nullptr)

@@ -475,13 +475,14 @@ static LRESULT CALLBACK RenameEditSubclassProc(HWND hwnd, UINT uMsg, WPARAM wPar
 	case WM_KEYDOWN:

 		switch (wParam) {

 		case VK_RETURN:

-			cli.pfnEndRename(GetParent(hwnd), (ClcData *) GetWindowLongPtr(GetParent(hwnd), 0), 1);

+			Clist_EndRename((ClcData *) GetWindowLongPtr(GetParent(hwnd), 0), 1);

 			return 0;

 		case VK_ESCAPE:

-			cli.pfnEndRename(GetParent(hwnd), (ClcData *) GetWindowLongPtr(GetParent(hwnd), 0), 0);

+			Clist_EndRename((ClcData *) GetWindowLongPtr(GetParent(hwnd), 0), 0);

 			return 0;

 		}

 		break;

+	

 	case WM_GETDLGCODE:

 		if (lParam) {

 			MSG *msg = (MSG*)lParam;

@@ -491,8 +492,9 @@ static LRESULT CALLBACK RenameEditSubclassProc(HWND hwnd, UINT uMsg, WPARAM wPar
 				return 0;

 		}

 		return DLGC_WANTMESSAGE;

+	

 	case WM_KILLFOCUS:

-		cli.pfnEndRename(GetParent(hwnd), (ClcData *) GetWindowLongPtr(GetParent(hwnd), 0), 1);

+		Clist_EndRename((ClcData *) GetWindowLongPtr(GetParent(hwnd), 0), 1);

 		return 0;

 	}

 	return mir_callNextSubclass(hwnd, RenameEditSubclassProc, uMsg, wParam, lParam);

diff --git a/src/mir_app/src/clistcore.cpp b/src/mir_app/src/clistcore.cpp
index a7f1bc9572..f93ff81f87 100644
--- a/src/mir_app/src/clistcore.cpp
+++ b/src/mir_app/src/clistcore.cpp
@@ -100,7 +100,6 @@ void InitClistCore()
 	cli.pfnSetGroupExpand = fnSetGroupExpand;

 	cli.pfnDoSelectionDefaultAction = fnDoSelectionDefaultAction;

 	cli.pfnFindRowByText = fnFindRowByText;

-	cli.pfnEndRename = fnEndRename;

 	

 	cli.pfnBeginRenameSelection = fnBeginRenameSelection;

 	cli.pfnIsVisibleContact = fnIsVisibleContact;

diff --git a/src/mir_app/src/mir_app.def b/src/mir_app/src/mir_app.def
index e999a3c97d..b776392554 100644
--- a/src/mir_app/src/mir_app.def
+++ b/src/mir_app/src/mir_app.def
@@ -568,3 +568,4 @@ Clist_IsHiddenMode @587
 Clist_ClcStatusToPf2 @588

 Clist_CalcEipPosition @589

 Clist_DeleteFromContactList @590

+Clist_EndRename @591

diff --git a/src/mir_app/src/mir_app64.def b/src/mir_app/src/mir_app64.def
index bc5d92f576..eea6bae720 100644
--- a/src/mir_app/src/mir_app64.def
+++ b/src/mir_app/src/mir_app64.def
@@ -568,3 +568,4 @@ Clist_IsHiddenMode @587
 Clist_ClcStatusToPf2 @588

 Clist_CalcEipPosition @589

 Clist_DeleteFromContactList @590

+Clist_EndRename @591