From 3de995f6736e1869fedbff7d14c210df0b9b20a9 Mon Sep 17 00:00:00 2001
From: George Hazan <ghazan@miranda.im>
Date: Thu, 4 Aug 2022 17:52:34 +0300
Subject: custom icons for UserInfo (AVS, SeenPlugin)

---
 src/core/stduserinfo/src/contactinfo.cpp | 2 +-
 src/core/stduserinfo/src/stdinfo.cpp     | 8 ++++----
 src/core/stduserinfo/src/userinfo.cpp    | 6 ++++--
 3 files changed, 9 insertions(+), 7 deletions(-)

(limited to 'src/core')

diff --git a/src/core/stduserinfo/src/contactinfo.cpp b/src/core/stduserinfo/src/contactinfo.cpp
index 165c6ba214..8447a39024 100644
--- a/src/core/stduserinfo/src/contactinfo.cpp
+++ b/src/core/stduserinfo/src/contactinfo.cpp
@@ -570,6 +570,6 @@ void InitContactInfo(WPARAM wParam, USERINFOPAGE &uip)
 {
 	uip.pDialog = new CContactPage();
 	uip.szTitle.a = LPGEN("Contact");
-	uip.dwInitParam = IDI_CONTACT;
+	uip.dwInitParam = (INT_PTR)g_plugin.getIconHandle(IDI_CONTACT);
 	g_plugin.addUserInfo(wParam, &uip);
 }
diff --git a/src/core/stduserinfo/src/stdinfo.cpp b/src/core/stduserinfo/src/stdinfo.cpp
index cea7d02464..9b7f624307 100644
--- a/src/core/stduserinfo/src/stdinfo.cpp
+++ b/src/core/stduserinfo/src/stdinfo.cpp
@@ -467,19 +467,19 @@ int DetailsInit(WPARAM wParam, LPARAM lParam)
 	uip.pDialog = new CSummaryDlg();
 	uip.szGroup.a = LPGEN("General");
 	uip.szTitle.a = LPGEN("Summary");
-	uip.dwInitParam = IDI_SUMMARY;
+	uip.dwInitParam = (INT_PTR)g_plugin.getIconHandle(IDI_SUMMARY);
 	g_plugin.addUserInfo(wParam, &uip);
 
 	InitContactInfo(wParam, uip);
 
 	uip.pDialog = new CLocationDlg();
 	uip.szTitle.a = LPGEN("Location");
-	uip.dwInitParam = IDI_LOCATION;
+	uip.dwInitParam = (INT_PTR)g_plugin.getIconHandle(IDI_LOCATION);
 	g_plugin.addUserInfo(wParam, &uip);
 
 	uip.pDialog = new CWorkDlg();
 	uip.szTitle.a = LPGEN("Work");
-	uip.dwInitParam = IDI_WORK;
+	uip.dwInitParam = (INT_PTR)g_plugin.getIconHandle(IDI_WORK);
 	g_plugin.addUserInfo(wParam, &uip);
 
 	uip.pDialog = new CBackgroundDlg();
@@ -489,7 +489,7 @@ int DetailsInit(WPARAM wParam, LPARAM lParam)
 
 	uip.pDialog = new CNotesDlg();
 	uip.szTitle.a = LPGEN("Notes");
-	uip.dwInitParam = IDI_NOTES;
+	uip.dwInitParam = (INT_PTR)g_plugin.getIconHandle(IDI_NOTES);
 	g_plugin.addUserInfo(wParam, &uip);
 	return 0;
 }
diff --git a/src/core/stduserinfo/src/userinfo.cpp b/src/core/stduserinfo/src/userinfo.cpp
index 82b0cc3ae3..0d24f785b6 100644
--- a/src/core/stduserinfo/src/userinfo.cpp
+++ b/src/core/stduserinfo/src/userinfo.cpp
@@ -158,9 +158,11 @@ class CUserInfoDlg : public CDlgBase
 
 			int iImage = 1;
 			if ((it->dwFlags & ODPF_ICON) && it->lParam) {
-				HICON hIcon = g_plugin.getIcon(it->lParam);
-				if (hIcon)
+				HICON hIcon = IcoLib_GetIconByHandle((HANDLE)it->lParam);
+				if (hIcon) {
 					iImage = ImageList_AddIcon(m_imageList, hIcon);
+					IcoLib_ReleaseIcon(hIcon);
+				}
 			}
 
 			TVINSERTSTRUCT tvis;
-- 
cgit v1.2.3