int hLangpack/m_hLang removed and replaced with HPLUGIN

8 files changed, 14 insertions, 17 deletions

diff --git a/plugins/UserInfoEx/src/Flags/svc_flags.cpp b/plugins/UserInfoEx/src/Flags/svc_flags.cpp
index 972e4d5214..9d8f999db2 100644
--- a/plugins/UserInfoEx/src/Flags/svc_flags.cpp
+++ b/plugins/UserInfoEx/src/Flags/svc_flags.cpp
@@ -238,7 +238,7 @@ void SvcFlagsOnModulesLoaded()
 	sid.szModule = MODNAMEFLAGS;

 	if (!g_bShowStatusIconFlag)

 		sid.flags = MBF_HIDDEN;

-	Srmm_AddIcon(&sid, g_plugin.m_hLang);

+	Srmm_AddIcon(&sid, &g_plugin);

 

 	HookEvent(ME_DB_CONTACT_SETTINGCHANGED, OnContactSettingChanged);

 	HookEvent(ME_CLIST_EXTRA_IMAGE_APPLY, OnCListApplyIcons);

diff --git a/plugins/UserInfoEx/src/classPsTree.cpp b/plugins/UserInfoEx/src/classPsTree.cpp
index d1567bba69..fb895460cc 100644
--- a/plugins/UserInfoEx/src/classPsTree.cpp
+++ b/plugins/UserInfoEx/src/classPsTree.cpp
@@ -127,8 +127,7 @@ int CPsTree::AddDummyItem(LPCSTR pszGroup)
 		psh._pPages	 = _pItems;
 		psh._numPages = _numItems;
 
-		OPTIONSDIALOGPAGE odp = { 0 };
-		odp.hInstance = g_plugin.getInst();
+		OPTIONSDIALOGPAGE odp = {};
 		odp.flags = ODPF_UNICODE;
 		odp.szTitle.w = mir_utf8decodeW(pszGroup);
 		
diff --git a/plugins/UserInfoEx/src/classPsTreeItem.cpp b/plugins/UserInfoEx/src/classPsTreeItem.cpp
index 2645b3f8d7..ff72aa2933 100644
--- a/plugins/UserInfoEx/src/classPsTreeItem.cpp
+++ b/plugins/UserInfoEx/src/classPsTreeItem.cpp
@@ -322,7 +322,7 @@ int CPsTreeItem::Icon(HIMAGELIST hIml, OPTIONSDIALOGPAGE *odp, BYTE bInitIconsOn
 		// the item to insert brings along an icon?

 		if (odp->flags & ODPF_ICON) {

 			// is it uinfoex item?

-			if (odp->hInstance == g_plugin.getInst()) {

+			if (odp->pPlugin == &g_plugin) {

 

 				// the pszGroup holds the iconfile for items added by uinfoex

 				sid.defaultFile.w = odp->szGroup.w;

@@ -383,9 +383,9 @@ int CPsTreeItem::Create(CPsHdr* pPsh, OPTIONSDIALOGPAGE *odp)
 	wchar_t szTitle[ MAXSETTING ];

 

 	// check parameter

-	if (pPsh && pPsh->_dwSize == sizeof(CPsHdr) && odp && PtrIsValid(odp->hInstance)) {

+	if (pPsh && pPsh->_dwSize == sizeof(CPsHdr) && odp && PtrIsValid(odp->pPlugin)) {

 		// instance value

-		_hInst = odp->hInstance;

+		_hInst = odp->pPlugin->getInst();

 		_dwFlags = odp->flags;

 		_initParam = odp->dwInitParam;

 

diff --git a/plugins/UserInfoEx/src/dlg_propsheet.cpp b/plugins/UserInfoEx/src/dlg_propsheet.cpp
index d0c212c04b..55a471a088 100644
--- a/plugins/UserInfoEx/src/dlg_propsheet.cpp
+++ b/plugins/UserInfoEx/src/dlg_propsheet.cpp
@@ -505,8 +505,7 @@ static int InitDetails(WPARAM wParam, LPARAM lParam)
 	if (!(pPsh->_dwFlags & PSF_PROTOPAGESONLY)) {

 		BYTE bChangeDetailsEnabled = myGlobals.CanChangeDetails && db_get_b(NULL, MODULENAME, SET_PROPSHEET_CHANGEMYDETAILS, FALSE);

 		if (lParam || bChangeDetailsEnabled) {

-			OPTIONSDIALOGPAGE odp = { 0 };

-			odp.hInstance = g_plugin.getInst();

+			OPTIONSDIALOGPAGE odp = {};

 			odp.flags = ODPF_ICON | ODPF_UNICODE;

 			odp.szGroup.w = IcoLib_GetDefaultIconFileName();

 

diff --git a/plugins/UserInfoEx/src/mir_menuitems.cpp b/plugins/UserInfoEx/src/mir_menuitems.cpp
index 75532fdfd8..157d7fcc1a 100644
--- a/plugins/UserInfoEx/src/mir_menuitems.cpp
+++ b/plugins/UserInfoEx/src/mir_menuitems.cpp
@@ -83,7 +83,7 @@ void RebuildContact()
 	RemoveMenuItems(hMenuItem, _countof(hMenuItem));

 

 	// support new genmenu style

-	CMenuItem mi(g_plugin);

+	CMenuItem mi(&g_plugin);

 

 	

 	switch (flag) {

@@ -176,7 +176,7 @@ void RebuildMain()
 	RemoveMenuItems(hMenuItem, _countof(hMenuItem));

 

 	// support new genmenu style

-	CMenuItem mi(g_plugin);

+	CMenuItem mi(&g_plugin);

 

 	switch (flag) {

 	case 3:

@@ -313,7 +313,7 @@ void RebuildGroup()
 	char text[200];

 	mir_strcpy(text, "UserInfo");

 

-	CMenuItem mi(g_plugin);

+	CMenuItem mi(&g_plugin);

 	mi.pszService = text;

 

 	switch (flag) {

@@ -404,7 +404,7 @@ void RebuildSubGroup()
 	char text[200];

 	mir_strcpy(text, "UserInfo");

 

-	CMenuItem mi(g_plugin);

+	CMenuItem mi(&g_plugin);

 	mi.pszService = text;

 	char* tDest = text + mir_strlen(text);

 

@@ -520,7 +520,7 @@ INT_PTR RebuildAccount(WPARAM, LPARAM lParam)
 		char text[200];

 		mir_strcpy(text, it->szProto);

 

-		CMenuItem mi(g_plugin);

+		CMenuItem mi(&g_plugin);

 		mi.pszService = text;

 		char* tDest = text + mir_strlen(text);

 

diff --git a/plugins/UserInfoEx/src/psp_options.cpp b/plugins/UserInfoEx/src/psp_options.cpp
index e37239af27..e8e6e9fd9c 100644
--- a/plugins/UserInfoEx/src/psp_options.cpp
+++ b/plugins/UserInfoEx/src/psp_options.cpp
@@ -1028,9 +1028,8 @@ static int OnInitOptions(WPARAM wParam, LPARAM)
 {

 	DlgContactInfoInitTreeIcons();

 

-	OPTIONSDIALOGPAGE odp = { 0 };

+	OPTIONSDIALOGPAGE odp = {};

 	odp.position = 95400;

-	odp.hInstance = g_plugin.getInst();

 	odp.szTitle.a = MODULELONGNAME;

 	odp.szGroup.a = LPGEN("Contacts");

 

diff --git a/plugins/UserInfoEx/src/svc_email.cpp b/plugins/UserInfoEx/src/svc_email.cpp
index 2d3960017b..8d7d7c4952 100644
--- a/plugins/UserInfoEx/src/svc_email.cpp
+++ b/plugins/UserInfoEx/src/svc_email.cpp
@@ -183,7 +183,7 @@ void SvcEMailRebuildMenu()
 

 		if (!ghMenuItem) {

 			// insert contact menuitem

-			CMenuItem mi(g_plugin);

+			CMenuItem mi(&g_plugin);

 			SET_UID(mi, 0x61d8e25a, 0x92e, 0x4470, 0x84, 0x57, 0x5e, 0x52, 0x17, 0x7f, 0xfa, 0x3);

 			mi.position = -2000010000;

 			mi.hIcolibItem = IcoLib_GetIcon(ICO_BTN_EMAIL);

diff --git a/plugins/UserInfoEx/src/svc_homepage.cpp b/plugins/UserInfoEx/src/svc_homepage.cpp
index 12e3e33b4a..dbf32d5f67 100644
--- a/plugins/UserInfoEx/src/svc_homepage.cpp
+++ b/plugins/UserInfoEx/src/svc_homepage.cpp
@@ -153,7 +153,7 @@ void SvcHomepageRebuildMenu()
 

 	if (!ghMenuItem) {

 		// insert contact menuitem

-		CMenuItem mi(g_plugin);

+		CMenuItem mi(&g_plugin);

 		SET_UID(mi, 0xdb78c16e, 0x50db, 0x4a40, 0x80, 0x0, 0xd1, 0xa4, 0x1c, 0x1b, 0xa3, 0x2d);

 		mi.position = -2000010000;

 		mi.hIcolibItem = IcoLib_GetIcon(ICO_BTN_GOTO);