From 7339bc08a765b87b0140e350a05fcf0d22a57722 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Sun, 7 Apr 2013 16:14:47 +0000
Subject: mir_getCLI() - a helper for MS_CLIST_RETRIEVE_INTERFACE, just call it
 without parameters

git-svn-id: http://svn.miranda-ng.org/main/trunk@4368 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 src/core/stdaway/main.cpp       | 3 +--
 src/core/stdclist/src/init.cpp  | 3 +--
 src/core/stdfile/main.cpp       | 3 +--
 src/core/stdhelp/main.cpp       | 3 +--
 src/core/stdidle/main.cpp       | 3 +--
 src/core/stduihist/main.cpp     | 3 +--
 src/core/stdurl/main.cpp        | 3 +--
 src/core/stduserinfo/main.cpp   | 3 +--
 src/core/stduseronline/main.cpp | 3 +--
 9 files changed, 9 insertions(+), 18 deletions(-)

(limited to 'src')

diff --git a/src/core/stdaway/main.cpp b/src/core/stdaway/main.cpp
index 210c8d7971..1f7e8aa9db 100644
--- a/src/core/stdaway/main.cpp
+++ b/src/core/stdaway/main.cpp
@@ -57,8 +57,7 @@ extern "C" __declspec(dllexport) const MUUID MirandaInterfaces[] = { MIID_SRAWAY
 extern "C" int __declspec(dllexport) Load(void)
 {
 	mir_getLP(&pluginInfo);
-
-	pcli = ( CLIST_INTERFACE* )CallService(MS_CLIST_RETRIEVE_INTERFACE, 0, (LPARAM)hInst);
+	mir_getCLI();
 
 	LoadAwayMsgModule();
 	return 0;
diff --git a/src/core/stdclist/src/init.cpp b/src/core/stdclist/src/init.cpp
index 6f7f69a575..b8b542cc35 100644
--- a/src/core/stdclist/src/init.cpp
+++ b/src/core/stdclist/src/init.cpp
@@ -134,8 +134,7 @@ static INT_PTR GetStatusMode(WPARAM wParam, LPARAM lParam)
 extern "C" __declspec(dllexport) int CListInitialise()
 {
 	mir_getLP( &pluginInfo );
-
-	pcli = ( CLIST_INTERFACE* )CallService(MS_CLIST_RETRIEVE_INTERFACE, 0, (LPARAM)g_hInst);
+	mir_getCLI();
 
 	pcli->pfnPaintClc = PaintClc;
 
diff --git a/src/core/stdfile/main.cpp b/src/core/stdfile/main.cpp
index 842dc93577..27c81fb044 100644
--- a/src/core/stdfile/main.cpp
+++ b/src/core/stdfile/main.cpp
@@ -62,8 +62,7 @@ extern "C" int __declspec(dllexport) Load(void)
 {
 	mir_getLP(&pluginInfo);
 	mir_getTMI(&tmi);
-
-	pcli = ( CLIST_INTERFACE* )CallService(MS_CLIST_RETRIEVE_INTERFACE, 0, (LPARAM)hInst);
+	mir_getCLI();
 
 	if ( IsWinVer7Plus())
 		CoCreateInstance(CLSID_TaskbarList, NULL, CLSCTX_ALL, IID_ITaskbarList3, (void**)&pTaskbarInterface);
diff --git a/src/core/stdhelp/main.cpp b/src/core/stdhelp/main.cpp
index 8f2b6da362..bcccc652ed 100644
--- a/src/core/stdhelp/main.cpp
+++ b/src/core/stdhelp/main.cpp
@@ -59,8 +59,7 @@ extern "C" int __declspec(dllexport) Load(void)
 {
 	mir_getLP(&pluginInfo);
 	mir_getTMI(&tmi);
-
-	pcli = ( CLIST_INTERFACE* )CallService(MS_CLIST_RETRIEVE_INTERFACE, 0, (LPARAM)hInst);
+	mir_getCLI();
 
 	LoadHelpModule();
 	return 0;
diff --git a/src/core/stdidle/main.cpp b/src/core/stdidle/main.cpp
index 9906dedd38..50a9b58e6f 100644
--- a/src/core/stdidle/main.cpp
+++ b/src/core/stdidle/main.cpp
@@ -72,8 +72,7 @@ extern "C" int __declspec(dllexport) Load(void)
 
 	MyMonitorFromWindow = (pfnMyMonitorFromWindow)GetProcAddress(hUser32, "MonitorFromWindow");
 	MyGetMonitorInfo = (pfnMyGetMonitorInfo)GetProcAddress(hUser32, "GetMonitorInfoW");
-
-	pcli = ( CLIST_INTERFACE* )CallService(MS_CLIST_RETRIEVE_INTERFACE, 0, (LPARAM)hInst);
+	mir_getCLI();
 
 	LoadIdleModule();
 	return 0;
diff --git a/src/core/stduihist/main.cpp b/src/core/stduihist/main.cpp
index 5b8893e4d5..97aa626562 100644
--- a/src/core/stduihist/main.cpp
+++ b/src/core/stduihist/main.cpp
@@ -59,8 +59,7 @@ extern "C" int __declspec(dllexport) Load(void)
 {
 	mir_getLP(&pluginInfo);
 	mir_getTMI(&tmi);
-
-	pcli = ( CLIST_INTERFACE* )CallService(MS_CLIST_RETRIEVE_INTERFACE, 0, (LPARAM)hInst);
+	mir_getCLI();
 
 	LoadHistoryModule();
 	return 0;
diff --git a/src/core/stdurl/main.cpp b/src/core/stdurl/main.cpp
index 2889278111..5b389f6879 100644
--- a/src/core/stdurl/main.cpp
+++ b/src/core/stdurl/main.cpp
@@ -59,8 +59,7 @@ extern "C" int __declspec(dllexport) Load(void)
 {
 	mir_getLP(&pluginInfo);
 	mir_getTMI(&tmi);
-
-	pcli = ( CLIST_INTERFACE* )CallService(MS_CLIST_RETRIEVE_INTERFACE, 0, (LPARAM)hInst);
+	mir_getCLI();
 
 	LoadSendRecvUrlModule();
 	return 0;
diff --git a/src/core/stduserinfo/main.cpp b/src/core/stduserinfo/main.cpp
index 0f6ab9de42..f75fb42bc6 100644
--- a/src/core/stduserinfo/main.cpp
+++ b/src/core/stduserinfo/main.cpp
@@ -61,8 +61,7 @@ extern "C" int __declspec(dllexport) Load(void)
 {
 	mir_getLP(&pluginInfo);
 	mir_getTMI(&tmi);
-
-	pcli = ( CLIST_INTERFACE* )CallService(MS_CLIST_RETRIEVE_INTERFACE, 0, (LPARAM)hInst);
+	mir_getCLI();
 
 	if ( IsWinVerXPPlus()) {
 		HINSTANCE hThemeAPI = LoadLibraryA("uxtheme.dll");
diff --git a/src/core/stduseronline/main.cpp b/src/core/stduseronline/main.cpp
index 7dcf6c09f4..2f9a1cdf87 100644
--- a/src/core/stduseronline/main.cpp
+++ b/src/core/stduseronline/main.cpp
@@ -57,8 +57,7 @@ extern "C" __declspec(dllexport) const MUUID MirandaInterfaces[] = { MIID_USERON
 extern "C" int __declspec(dllexport) Load(void)
 {
 	mir_getLP(&pluginInfo);
-
-	pcli = ( CLIST_INTERFACE* )CallService(MS_CLIST_RETRIEVE_INTERFACE, 0, (LPARAM)hInst);
+	mir_getCLI();
 
 	LoadUserOnlineModule();
 	return 0;
-- 
cgit v1.2.3