From 6b05d57a1d02f233409a2e4392e22b7a3a756a8f Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Mon, 8 Apr 2013 11:37:28 +0000
Subject: fix for the undocumented MS_CLIST_RETRIEVE_INTERFACE feature

git-svn-id: http://svn.miranda-ng.org/main/trunk@4384 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 plugins/Clist_modern/src/init.cpp | 10 +++++-----
 plugins/Clist_mw/src/init.cpp     |  3 ++-
 plugins/Clist_nicer/src/init.cpp  |  5 +++--
 3 files changed, 10 insertions(+), 8 deletions(-)

(limited to 'plugins')

diff --git a/plugins/Clist_modern/src/init.cpp b/plugins/Clist_modern/src/init.cpp
index 360d4dfebd..ec23b806a0 100644
--- a/plugins/Clist_modern/src/init.cpp
+++ b/plugins/Clist_modern/src/init.cpp
@@ -82,6 +82,10 @@ extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD miranda
 
 extern "C" __declspec(dllexport) int CListInitialise()
 {
+	mir_getLP( &pluginInfo );
+	mir_getCLI();
+	mir_getTMI(&tmi);
+
 	HMODULE hKernel = GetModuleHandleA("kernel32.dll");
 	fnTryEnterCriticalSection = ( pfnTryEnterCriticalSection )GetProcAddress( hKernel, "TryEnterCriticalSection");
 
@@ -94,8 +98,6 @@ extern "C" __declspec(dllexport) int CListInitialise()
 		fnGetAncestor = MyGetAncestor;
 
 	g_dwMainThreadID = GetCurrentThreadId();
-	mir_getTMI(&tmi);
-	mir_getLP( &pluginInfo );
 
 	CHECKRES ( PreLoadContactListModule ( )	);
 	CHECKRES ( SubclassClistInterface ( )	);
@@ -142,9 +144,6 @@ extern "C" __declspec(dllexport) int Unload(void)
 
 static HRESULT SubclassClistInterface()
 {
-	// get the contact list interface
-	mir_getCLI();
-
 	// OVERLOAD CLIST INTERFACE FUNCTIONS
 	//
 	//	Naming convention is:
@@ -154,6 +153,7 @@ static HRESULT SubclassClistInterface()
 
 	corecli = *pcli;
 
+	pcli->hInst = g_hInst;
 	pcli->bDisplayLocked = TRUE;
 
 	pcli->pfnCheckCacheItem	= cliCheckCacheItem;
diff --git a/plugins/Clist_mw/src/init.cpp b/plugins/Clist_mw/src/init.cpp
index 667f23f288..be7d95d862 100644
--- a/plugins/Clist_mw/src/init.cpp
+++ b/plugins/Clist_mw/src/init.cpp
@@ -153,10 +153,11 @@ extern "C" int __declspec(dllexport) CListInitialise()
 
 	OutputDebugStringA("CListInitialise ClistMW\r\n");
 	mir_getLP( &pluginInfo );
+	mir_getCLI();
 
 	PreloadCLCModule();
 
-	mir_getCLI();
+	pcli->hInst = g_hInst;
 	pcli->pfnBuildGroupPopupMenu = BuildGroupPopupMenu;
 	pcli->pfnCalcEipPosition = CalcEipPosition;
 	pcli->pfnCheckCacheItem = CheckPDNCE;
diff --git a/plugins/Clist_nicer/src/init.cpp b/plugins/Clist_nicer/src/init.cpp
index a812acaeb1..6a1852e33e 100644
--- a/plugins/Clist_nicer/src/init.cpp
+++ b/plugins/Clist_nicer/src/init.cpp
@@ -208,8 +208,9 @@ static int fnIconFromStatusMode( const char* szProto, int status, HANDLE hContac
 
 extern "C" int __declspec(dllexport) CListInitialise()
 {
-	mir_getTMI(&tmi);
 	mir_getLP( &pluginInfo );
+	mir_getCLI();
+	mir_getTMI(&tmi);
 
 	API::onInit();
 	RegisterCLUIFrameClasses();
@@ -278,7 +279,7 @@ extern "C" int __declspec(dllexport) CListInitialise()
 	PreloadContactListModule();
 
 	// get the clist interface
-	mir_getCLI();
+	pcli->hInst = g_hInst;
 	pcli->pfnBuildGroupPopupMenu = BuildGroupPopupMenu;
 	pcli->pfnCluiProtocolStatusChanged = CluiProtocolStatusChanged;
 	pcli->pfnCompareContacts = CompareContacts;
-- 
cgit v1.2.3