diff options
127 files changed, 124 insertions, 140 deletions
diff --git a/bin10/lib/mir_app.lib b/bin10/lib/mir_app.lib Binary files differindex a6393c746c..60b0f6d8c8 100644 --- a/bin10/lib/mir_app.lib +++ b/bin10/lib/mir_app.lib diff --git a/bin10/lib/mir_app64.lib b/bin10/lib/mir_app64.lib Binary files differindex e65d5a7cb5..8e9c42ba5c 100644 --- a/bin10/lib/mir_app64.lib +++ b/bin10/lib/mir_app64.lib diff --git a/bin12/lib/mir_app.lib b/bin12/lib/mir_app.lib Binary files differindex a6393c746c..60b0f6d8c8 100644 --- a/bin12/lib/mir_app.lib +++ b/bin12/lib/mir_app.lib diff --git a/bin12/lib/mir_app64.lib b/bin12/lib/mir_app64.lib Binary files differindex e65d5a7cb5..8e9c42ba5c 100644 --- a/bin12/lib/mir_app64.lib +++ b/bin12/lib/mir_app64.lib diff --git a/bin14/lib/mir_app.lib b/bin14/lib/mir_app.lib Binary files differindex a6393c746c..60b0f6d8c8 100644 --- a/bin14/lib/mir_app.lib +++ b/bin14/lib/mir_app.lib diff --git a/bin14/lib/mir_app64.lib b/bin14/lib/mir_app64.lib Binary files differindex e65d5a7cb5..8e9c42ba5c 100644 --- a/bin14/lib/mir_app64.lib +++ b/bin14/lib/mir_app64.lib diff --git a/include/delphi/m_clistint.inc b/include/delphi/m_clistint.inc index 2568903f6c..f472cd2775 100644 --- a/include/delphi/m_clistint.inc +++ b/include/delphi/m_clistint.inc @@ -256,14 +256,6 @@ const TIM_CALLBACK = WM_USER+1857;
TIM_CREATE = WM_USER+1858;
-const
-{
- Miranda 0.4.3.0+
- retrieves the pointer to a CLIST_INTERFACE structure
- NOTE: valid only for the clist clone building, not for the regular use
-}
- MS_CLIST_RETRIEVE_INTERFACE:PansiChar = 'CList/RetrieveInterface';
-
{**************************************************************************
* CLIST_INTERFACE structure definition
************************************************************************** }
@@ -525,6 +517,8 @@ type pfnSetContactCheckboxes:procedure(cc:PClcContact; checked:int); cdecl;
end;
+function Clist_GetInterface : PCLIST_INTERFACE; stdcall; external AppDll;
+
var
cli : PCLIST_INTERFACE;
diff --git a/include/delphi/m_helpers.inc b/include/delphi/m_helpers.inc index 98173a3242..0e51727d89 100644 --- a/include/delphi/m_helpers.inc +++ b/include/delphi/m_helpers.inc @@ -542,6 +542,6 @@ begin end;
initialization
- cli:=PCLIST_INTERFACE(CallService(MS_CLIST_RETRIEVE_INTERFACE,0,0));
+ cli := Clist_GetInterface();
{$ENDIF}
diff --git a/include/m_clistint.h b/include/m_clistint.h index daa37cc59e..648eb84dda 100644 --- a/include/m_clistint.h +++ b/include/m_clistint.h @@ -496,13 +496,9 @@ struct CLIST_INTERFACE // retrieves the pointer to a CLIST_INTERFACE structure
// NOTE: valid only for the clist clone building, not for the regular use
-#define MS_CLIST_RETRIEVE_INTERFACE "CList/RetrieveInterface"
+EXTERN_C MIR_APP_DLL(CLIST_INTERFACE*) Clist_GetInterface(void);
#ifndef MIR_APP_EXPORTS
extern CLIST_INTERFACE *pcli;
-
- __forceinline void mir_getCLI()
- { pcli = (CLIST_INTERFACE*)CallService(MS_CLIST_RETRIEVE_INTERFACE, 0, 0);
- }
#endif
#endif // M_CLISTINT_H__
diff --git a/plugins/AVS/src/main.cpp b/plugins/AVS/src/main.cpp index 1fe80d8d71..ccdfc1ce8a 100644 --- a/plugins/AVS/src/main.cpp +++ b/plugins/AVS/src/main.cpp @@ -400,7 +400,7 @@ extern "C" __declspec(dllexport) PLUGININFOEX * MirandaPluginInfoEx(DWORD) extern "C" int __declspec(dllexport) Load(void)
{
mir_getLP(&pluginInfoEx);
- mir_getCLI();
+ pcli = Clist_GetInterface();
INT_PTR result = CALLSERVICE_NOTFOUND;
if (ServiceExists(MS_IMG_GETINTERFACE))
diff --git a/plugins/AddContactPlus/src/main.cpp b/plugins/AddContactPlus/src/main.cpp index 1fb4cc51bf..df8bcbc37d 100644 --- a/plugins/AddContactPlus/src/main.cpp +++ b/plugins/AddContactPlus/src/main.cpp @@ -144,7 +144,7 @@ static int OnModulesLoaded(WPARAM, LPARAM) extern "C" int __declspec(dllexport) Load(void)
{
mir_getLP(&pluginInfo);
- mir_getCLI();
+ pcli = Clist_GetInterface();
INITCOMMONCONTROLSEX icex = { sizeof(icex), ICC_USEREX_CLASSES };
InitCommonControlsEx(&icex);
diff --git a/plugins/Alarms/src/alarms.cpp b/plugins/Alarms/src/alarms.cpp index 71c2606ec0..14b2fe39a6 100644 --- a/plugins/Alarms/src/alarms.cpp +++ b/plugins/Alarms/src/alarms.cpp @@ -152,7 +152,7 @@ static int MainDeInit(WPARAM, LPARAM) extern "C" int __declspec(dllexport) Load(void)
{
mir_getLP(&pluginInfo);
- mir_getCLI();
+ pcli = Clist_GetInterface();
// ensure datetime picker is loaded
INITCOMMONCONTROLSEX ccx;
diff --git a/plugins/AutoShutdown/src/main.cpp b/plugins/AutoShutdown/src/main.cpp index fca05d6585..4da45e527e 100644 --- a/plugins/AutoShutdown/src/main.cpp +++ b/plugins/AutoShutdown/src/main.cpp @@ -68,7 +68,7 @@ extern "C" __declspec(dllexport) const PLUGININFOEX* MirandaPluginInfoEx(DWORD) extern "C" __declspec(dllexport) int Load(void)
{
mir_getLP(&pluginInfo);
- mir_getCLI();
+ pcli = Clist_GetInterface();
INITCOMMONCONTROLSEX icc;
icc.dwSize = sizeof(icc);
diff --git a/plugins/AvatarHistory/src/AvatarHistory.cpp b/plugins/AvatarHistory/src/AvatarHistory.cpp index d6bb00dc21..8ff71a8b5d 100644 --- a/plugins/AvatarHistory/src/AvatarHistory.cpp +++ b/plugins/AvatarHistory/src/AvatarHistory.cpp @@ -294,7 +294,7 @@ static INT_PTR CALLBACK FirstRunDlgProc(HWND hwnd,UINT uMsg,WPARAM wParam,LPARAM extern "C" __declspec(dllexport) int Load(void)
{
mir_getLP(&pluginInfo);
- mir_getCLI();
+ pcli = Clist_GetInterface();
CoInitialize(NULL);
diff --git a/plugins/BASS_interface/src/Main.cpp b/plugins/BASS_interface/src/Main.cpp index 8d3fbac9dd..3a9cccf74c 100644 --- a/plugins/BASS_interface/src/Main.cpp +++ b/plugins/BASS_interface/src/Main.cpp @@ -602,7 +602,7 @@ static IconItem iconList[] = extern "C" int __declspec(dllexport) Load(void)
{
mir_getLP(&pluginInfo);
- mir_getCLI();
+ pcli = Clist_GetInterface();
HookEvent(ME_SYSTEM_MODULESLOADED, OnModulesLoaded);
HookEvent(ME_SYSTEM_SHUTDOWN, OnShutdown);
diff --git a/plugins/BasicHistory/src/BasicHistory.cpp b/plugins/BasicHistory/src/BasicHistory.cpp index 4af03cc15c..aadddd58d2 100644 --- a/plugins/BasicHistory/src/BasicHistory.cpp +++ b/plugins/BasicHistory/src/BasicHistory.cpp @@ -245,7 +245,7 @@ int ModulesLoaded(WPARAM, LPARAM) extern "C" int __declspec(dllexport) Load(void)
{
mir_getLP(&pluginInfo);
- mir_getCLI();
+ pcli = Clist_GetInterface();
hTaskMainMenu = NULL;
DuplicateHandle(GetCurrentProcess(), GetCurrentThread(), GetCurrentProcess(), &g_hMainThread, 0, FALSE, DUPLICATE_SAME_ACCESS);
diff --git a/plugins/BossKeyPlus/src/BossKey.cpp b/plugins/BossKeyPlus/src/BossKey.cpp index 745cabb98c..2bb50f1e03 100644 --- a/plugins/BossKeyPlus/src/BossKey.cpp +++ b/plugins/BossKeyPlus/src/BossKey.cpp @@ -691,7 +691,7 @@ int MirandaLoaded(WPARAM, LPARAM) extern "C" int __declspec(dllexport) Load(void)
{
mir_getLP(&pluginInfo);
- mir_getCLI();
+ pcli = Clist_GetInterface();
g_wMaskAdv = db_get_w(NULL, MOD_NAME, "optsmaskadv", 0);
g_bOldSetting = db_get_b(NULL, MOD_NAME, "OldSetting", 0);
diff --git a/plugins/BuddyExpectator/src/BuddyExpectator.cpp b/plugins/BuddyExpectator/src/BuddyExpectator.cpp index 027ce00eff..de682600e7 100644 --- a/plugins/BuddyExpectator/src/BuddyExpectator.cpp +++ b/plugins/BuddyExpectator/src/BuddyExpectator.cpp @@ -660,7 +660,7 @@ int onShutdown(WPARAM, LPARAM) extern "C" int __declspec(dllexport) Load(void)
{
mir_getLP(&pluginInfo);
- mir_getCLI();
+ pcli = Clist_GetInterface();
InitOptions();
diff --git a/plugins/BuddyPounce/src/main.cpp b/plugins/BuddyPounce/src/main.cpp index dc69bbb53d..942b9a1c24 100644 --- a/plugins/BuddyPounce/src/main.cpp +++ b/plugins/BuddyPounce/src/main.cpp @@ -233,7 +233,7 @@ INT_PTR AddToPounce(WPARAM wParam, LPARAM lParam) extern "C" __declspec(dllexport) int Load(void)
{
mir_getLP(&pluginInfo);
- mir_getCLI();
+ pcli = Clist_GetInterface();
HookEvent(ME_SYSTEM_MODULESLOADED, MainInit);
HookEvent(ME_DB_CONTACT_SETTINGCHANGED, UserOnlineSettingChanged);
diff --git a/plugins/CSList/src/cslist.cpp b/plugins/CSList/src/cslist.cpp index dafe0afe87..f81912dfb8 100644 --- a/plugins/CSList/src/cslist.cpp +++ b/plugins/CSList/src/cslist.cpp @@ -115,7 +115,7 @@ static int OnPreshutdown(WPARAM, LPARAM) extern "C" __declspec(dllexport) int Load() { mir_getLP(&pluginInfoEx); - mir_getCLI(); + pcli = Clist_GetInterface(); // support for ComboBoxEx INITCOMMONCONTROLSEX icc; diff --git a/plugins/ClientChangeNotify/src/ClientChangeNotify.cpp b/plugins/ClientChangeNotify/src/ClientChangeNotify.cpp index 55621267d2..30f6df1406 100644 --- a/plugins/ClientChangeNotify/src/ClientChangeNotify.cpp +++ b/plugins/ClientChangeNotify/src/ClientChangeNotify.cpp @@ -351,7 +351,7 @@ int MirandaLoaded(WPARAM, LPARAM) extern "C" int __declspec(dllexport) Load(void)
{
mir_getLP(&pluginInfo);
- mir_getCLI();
+ pcli = Clist_GetInterface();
HookEvent(ME_SYSTEM_MODULESLOADED, MirandaLoaded);
DuplicateHandle(GetCurrentProcess(), GetCurrentThread(), GetCurrentProcess(), &g_hMainThread, THREAD_SET_CONTEXT, false, 0);
diff --git a/plugins/Clist_blind/src/init.cpp b/plugins/Clist_blind/src/init.cpp index 18e9ad813c..e7b52d7540 100644 --- a/plugins/Clist_blind/src/init.cpp +++ b/plugins/Clist_blind/src/init.cpp @@ -129,7 +129,7 @@ static INT_PTR GetStatusMode(WPARAM, LPARAM) extern "C" int __declspec(dllexport) CListInitialise()
{
- mir_getCLI();
+ pcli = Clist_GetInterface();
g_bSortByStatus = db_get_b(NULL, "CList", "SortByStatus", SETTING_SORTBYSTATUS_DEFAULT);
g_bSortByProto = db_get_b(NULL, "CList", "SortByProto", SETTING_SORTBYPROTO_DEFAULT);
diff --git a/plugins/Clist_modern/src/init.cpp b/plugins/Clist_modern/src/init.cpp index ccb7e2a412..df65582eef 100644 --- a/plugins/Clist_modern/src/init.cpp +++ b/plugins/Clist_modern/src/init.cpp @@ -132,7 +132,7 @@ static HRESULT SubclassClistInterface() // 'save*' - pointer to stored default parent handle
// 'cli_*' - new handler with default core service calling
- mir_getCLI();
+ pcli = Clist_GetInterface();
corecli = *pcli;
pcli->hInst = g_hInst;
diff --git a/plugins/Clist_nicer/src/init.cpp b/plugins/Clist_nicer/src/init.cpp index e6f3473460..adb599e45c 100644 --- a/plugins/Clist_nicer/src/init.cpp +++ b/plugins/Clist_nicer/src/init.cpp @@ -123,7 +123,7 @@ extern "C" int __declspec(dllexport) CListInitialise() {
mir_getLP(&pluginInfo);
- mir_getCLI();
+ pcli = Clist_GetInterface();
coreCli = *pcli;
API::onInit();
diff --git a/plugins/CmdLine/src/CmdLine.cpp b/plugins/CmdLine/src/CmdLine.cpp index 1b281cff61..f73288f91b 100644 --- a/plugins/CmdLine/src/CmdLine.cpp +++ b/plugins/CmdLine/src/CmdLine.cpp @@ -47,7 +47,7 @@ extern "C" __declspec(dllexport) PLUGININFOEX *MirandaPluginInfoEx(DWORD) extern "C" int __declspec(dllexport) Load(void)
{
mir_getLP(&pluginInfo);
- mir_getCLI();
+ pcli = Clist_GetInterface();
if (InitServer())
MessageBox(0, TranslateT("Could not initialize CmdLine plugin property"), TranslateT("Error"), MB_ICONEXCLAMATION | MB_OK);
diff --git a/plugins/ConnectionNotify/src/ConnectionNotify.cpp b/plugins/ConnectionNotify/src/ConnectionNotify.cpp index 46200dfaec..85aaa80972 100644 --- a/plugins/ConnectionNotify/src/ConnectionNotify.cpp +++ b/plugins/ConnectionNotify/src/ConnectionNotify.cpp @@ -852,7 +852,7 @@ extern "C" int __declspec(dllexport) Load(void) #endif
mir_getLP(&pluginInfo);
- mir_getCLI();
+ pcli = Clist_GetInterface();
hExceptionsMutex = CreateMutex(NULL, FALSE, L"ExceptionsMutex");
diff --git a/plugins/ContactsPlus/src/main.cpp b/plugins/ContactsPlus/src/main.cpp index 2117b37bb1..4ac9334000 100644 --- a/plugins/ContactsPlus/src/main.cpp +++ b/plugins/ContactsPlus/src/main.cpp @@ -201,7 +201,7 @@ extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD) extern "C" __declspec(dllexport) int Load(void)
{
mir_getLP(&pluginInfo);
- mir_getCLI();
+ pcli = Clist_GetInterface();
InitCommonControls();
diff --git a/plugins/FTPFileYM/src/ftpfile.cpp b/plugins/FTPFileYM/src/ftpfile.cpp index c915436f48..588e7be378 100644 --- a/plugins/FTPFileYM/src/ftpfile.cpp +++ b/plugins/FTPFileYM/src/ftpfile.cpp @@ -388,7 +388,7 @@ int Shutdown(WPARAM, LPARAM) extern "C" int __declspec(dllexport) Load(void)
{
mir_getLP(&pluginInfoEx);
- mir_getCLI();
+ pcli = Clist_GetInterface();
#ifdef _DEBUG
_CrtSetDbgFlag(_CRTDBG_ALLOC_MEM_DF | _CRTDBG_LEAK_CHECK_DF);
diff --git a/plugins/FavContacts/src/main.cpp b/plugins/FavContacts/src/main.cpp index 42cc773ae7..22fa356b6c 100644 --- a/plugins/FavContacts/src/main.cpp +++ b/plugins/FavContacts/src/main.cpp @@ -68,7 +68,7 @@ extern "C" __declspec(dllexport) PLUGININFOEX *MirandaPluginInfoEx(DWORD) extern "C" __declspec(dllexport) int Load(void)
{
mir_getLP(&pluginInfo);
- mir_getCLI();
+ pcli = Clist_GetInterface();
g_contactCache = new CContactCache;
diff --git a/plugins/FileAsMessage/src/main.cpp b/plugins/FileAsMessage/src/main.cpp index 8f9ae9d594..51c8b53d83 100644 --- a/plugins/FileAsMessage/src/main.cpp +++ b/plugins/FileAsMessage/src/main.cpp @@ -191,7 +191,7 @@ static int OnModulesLoaded(WPARAM, LPARAM) extern "C" __declspec(dllexport) int Load(void)
{
mir_getLP(&pluginInfo);
- mir_getCLI();
+ pcli = Clist_GetInterface();
InitCRC32();
diff --git a/plugins/FloatingContacts/src/main.cpp b/plugins/FloatingContacts/src/main.cpp index 0f7b433256..6a593f6ab6 100644 --- a/plugins/FloatingContacts/src/main.cpp +++ b/plugins/FloatingContacts/src/main.cpp @@ -908,7 +908,7 @@ static int OnPreshutdown(WPARAM, LPARAM) extern "C" int __declspec(dllexport) Load()
{
mir_getLP(&pluginInfoEx);
- mir_getCLI();
+ pcli = Clist_GetInterface();
Icon_RegisterT(hInst, MODULEW, g_iconList, _countof(g_iconList));
LoadMenus();
diff --git a/plugins/GmailNotifier/src/main.cpp b/plugins/GmailNotifier/src/main.cpp index 60479823c0..af427d1836 100644 --- a/plugins/GmailNotifier/src/main.cpp +++ b/plugins/GmailNotifier/src/main.cpp @@ -89,7 +89,7 @@ extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD) extern "C" int __declspec(dllexport) Load()
{
mir_getLP(&pluginInfoEx);
- mir_getCLI();
+ pcli = Clist_GetInterface();
SkinAddNewSoundEx("Gmail", LPGEN("Other"), LPGEN("Gmail: New thread(s)"));
HookEvent(ME_CLIST_DOUBLECLICKED, OpenBrowser);
diff --git a/plugins/HTTPServer/src/main.cpp b/plugins/HTTPServer/src/main.cpp index 3a1145bf72..3fb5527318 100644 --- a/plugins/HTTPServer/src/main.cpp +++ b/plugins/HTTPServer/src/main.cpp @@ -857,7 +857,7 @@ extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD /*miran extern "C" __declspec(dllexport) int Load()
{
mir_getLP(&pluginInfo);
- mir_getCLI();
+ pcli = Clist_GetInterface();
hHttpAcceptConnectionsService = CreateServiceFunction(MS_HTTP_ACCEPT_CONNECTIONS, nToggelAcceptConnections);
if (!hHttpAcceptConnectionsService) {
diff --git a/plugins/HistoryLinkListPlus/src/linklist.cpp b/plugins/HistoryLinkListPlus/src/linklist.cpp index 5021b50f0f..fb74cbd4a0 100644 --- a/plugins/HistoryLinkListPlus/src/linklist.cpp +++ b/plugins/HistoryLinkListPlus/src/linklist.cpp @@ -48,7 +48,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD, LPVOID) extern "C" __declspec(dllexport) int Load(void)
{
mir_getLP(&pluginInfo);
- mir_getCLI();
+ pcli = Clist_GetInterface();
#ifdef DEBUG
{
diff --git a/plugins/HistoryStats/src/main.cpp b/plugins/HistoryStats/src/main.cpp index 4f3db4a67f..c37132df2c 100644 --- a/plugins/HistoryStats/src/main.cpp +++ b/plugins/HistoryStats/src/main.cpp @@ -421,7 +421,7 @@ extern "C" __declspec(dllexport) const PLUGININFOEX* MirandaPluginInfoEx(DWORD) extern "C" __declspec(dllexport) int Load()
{
mir_getLP(&g_pluginInfoEx);
- mir_getCLI();
+ pcli = Clist_GetInterface();
// init COM, needed for GUID generation
CoInitialize(NULL);
diff --git a/plugins/HwHotKeys/src/HwHotKeys_DllMain.cpp b/plugins/HwHotKeys/src/HwHotKeys_DllMain.cpp index 28be0ee7cb..eec095c9f1 100644 --- a/plugins/HwHotKeys/src/HwHotKeys_DllMain.cpp +++ b/plugins/HwHotKeys/src/HwHotKeys_DllMain.cpp @@ -107,7 +107,7 @@ extern "C" __declspec(dllexport) int Load(void) mir_getLP(&PluginInfoEx);
// Интерфейс контактлиста - макрос заполняет CLIST_INTERFACE *pcli;
- mir_getCLI();
+ pcli = Clist_GetInterface();
// регистрация диалога опций
HookEvent(ME_OPT_INITIALISE, initializeOptions);
diff --git a/plugins/IEView/src/ieview_main.cpp b/plugins/IEView/src/ieview_main.cpp index 87997933dd..b949bed4f3 100644 --- a/plugins/IEView/src/ieview_main.cpp +++ b/plugins/IEView/src/ieview_main.cpp @@ -67,7 +67,7 @@ extern "C" int __declspec(dllexport) Load(void) delete[] workingDir;
mir_getLP(&pluginInfoEx);
- mir_getCLI();
+ pcli = Clist_GetInterface();
HookEvent(ME_OPT_INITIALISE, IEViewOptInit);
HookEvent(ME_SYSTEM_MODULESLOADED, ModulesLoaded);
diff --git a/plugins/KeyboardNotify/src/main.cpp b/plugins/KeyboardNotify/src/main.cpp index 51eb50200b..e34ba2ceea 100644 --- a/plugins/KeyboardNotify/src/main.cpp +++ b/plugins/KeyboardNotify/src/main.cpp @@ -937,7 +937,7 @@ static int ModulesLoaded(WPARAM, LPARAM) extern "C" __declspec(dllexport) int Load(void)
{
mir_getLP(&pluginInfo);
- mir_getCLI();
+ pcli = Clist_GetInterface();
GetWindowsVersion();
OpenKeyboardDevice();
diff --git a/plugins/ListeningTo/src/listeningto.cpp b/plugins/ListeningTo/src/listeningto.cpp index 7dcad9e830..280e636e94 100644 --- a/plugins/ListeningTo/src/listeningto.cpp +++ b/plugins/ListeningTo/src/listeningto.cpp @@ -111,7 +111,7 @@ static IconItem iconList[] = extern "C" int __declspec(dllexport) Load(void)
{
mir_getLP(&pluginInfo);
- mir_getCLI();
+ pcli = Clist_GetInterface();
CoInitialize(NULL);
diff --git a/plugins/LotusNotify/src/LotusNotify.cpp b/plugins/LotusNotify/src/LotusNotify.cpp index 9639f2f385..f912f0433b 100644 --- a/plugins/LotusNotify/src/LotusNotify.cpp +++ b/plugins/LotusNotify/src/LotusNotify.cpp @@ -1665,7 +1665,7 @@ static int preshutdown(WPARAM, LPARAM) extern "C" int __declspec(dllexport) Load(void)
{
mir_getLP(&pluginInfo);
- mir_getCLI();
+ pcli = Clist_GetInterface();
Plugin_Terminated = false;
diff --git a/plugins/MenuItemEx/src/main.cpp b/plugins/MenuItemEx/src/main.cpp index 73e72e3d88..7f40aa30fb 100644 --- a/plugins/MenuItemEx/src/main.cpp +++ b/plugins/MenuItemEx/src/main.cpp @@ -1081,7 +1081,7 @@ extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD) extern "C" __declspec(dllexport) int Load(void)
{
mir_getLP(&pluginInfoEx);
- mir_getCLI();
+ pcli = Clist_GetInterface();
Icon_Register(hinstance, LPGEN("MenuItemEx"), iconList, _countof(iconList));
Icon_Register(hinstance, LPGEN("MenuItemEx"), overlayIconList, _countof(overlayIconList));
diff --git a/plugins/MirFox/src/MirandaInterface.cpp b/plugins/MirFox/src/MirandaInterface.cpp index 75d379347d..439b859643 100644 --- a/plugins/MirFox/src/MirandaInterface.cpp +++ b/plugins/MirFox/src/MirandaInterface.cpp @@ -149,7 +149,7 @@ static int OnShutdown(WPARAM, LPARAM) extern "C" int __declspec(dllexport) Load(void)
{
mir_getLP(&pluginInfo);
- mir_getCLI();
+ pcli = Clist_GetInterface();
HookEvent(ME_SYSTEM_MODULESLOADED, onModulesLoaded);
HookEvent(ME_SYSTEM_SHUTDOWN, OnShutdown);
diff --git a/plugins/MirOTR/src/dllmain.cpp b/plugins/MirOTR/src/dllmain.cpp index d32244bdef..1de567c0cb 100644 --- a/plugins/MirOTR/src/dllmain.cpp +++ b/plugins/MirOTR/src/dllmain.cpp @@ -61,7 +61,7 @@ extern "C" __declspec(dllexport) int Load(void) DEBUGOUTA("LOAD MIROTR");
mir_getLP(&pluginInfo);
- mir_getCLI();
+ pcli = Clist_GetInterface();
InitIcons();
diff --git a/plugins/MirandaG15/src/Miranda.cpp b/plugins/MirandaG15/src/Miranda.cpp index 39a13343fd..9c447d28e3 100644 --- a/plugins/MirandaG15/src/Miranda.cpp +++ b/plugins/MirandaG15/src/Miranda.cpp @@ -100,7 +100,7 @@ EXTERN_C __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD) EXTERN_C int __declspec(dllexport) Load()
{
mir_getLP(&pluginInfoEx);
- mir_getCLI();
+ pcli = Clist_GetInterface();
g_bInitialized = false;
diff --git a/plugins/Msg_Export/src/main.cpp b/plugins/Msg_Export/src/main.cpp index 4befc1c23b..72d24735dc 100755 --- a/plugins/Msg_Export/src/main.cpp +++ b/plugins/Msg_Export/src/main.cpp @@ -184,7 +184,7 @@ extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD) extern "C" __declspec(dllexport) int Load()
{
mir_getLP(&pluginInfo);
- mir_getCLI();
+ pcli = Clist_GetInterface();
HookEvent(ME_SYSTEM_MODULESLOADED, MainInit);
diff --git a/plugins/MyDetails/src/mydetails.cpp b/plugins/MyDetails/src/mydetails.cpp index a0b2d82d32..1c62064f17 100644 --- a/plugins/MyDetails/src/mydetails.cpp +++ b/plugins/MyDetails/src/mydetails.cpp @@ -144,7 +144,7 @@ static int MainUninit(WPARAM, LPARAM) extern "C" __declspec(dllexport) int Load()
{
mir_getLP(&pluginInfo);
- mir_getCLI();
+ pcli = Clist_GetInterface();
// Hook event to load messages and show first one
HookEvent(ME_SYSTEM_MODULESLOADED, MainInit);
diff --git a/plugins/NewAwaySysMod/src/AwaySys.cpp b/plugins/NewAwaySysMod/src/AwaySys.cpp index ff3b446ee7..07901cb226 100644 --- a/plugins/NewAwaySysMod/src/AwaySys.cpp +++ b/plugins/NewAwaySysMod/src/AwaySys.cpp @@ -716,7 +716,7 @@ int MirandaLoaded(WPARAM, LPARAM) extern "C" int __declspec(dllexport) Load(void)
{
mir_getLP(&pluginInfo);
- mir_getCLI();
+ pcli = Clist_GetInterface();
HookEvent(ME_SYSTEM_MODULESLOADED, MirandaLoaded);
diff --git a/plugins/NewEventNotify/src/main.cpp b/plugins/NewEventNotify/src/main.cpp index b81570c9f6..85fa3f1e9a 100644 --- a/plugins/NewEventNotify/src/main.cpp +++ b/plugins/NewEventNotify/src/main.cpp @@ -141,7 +141,7 @@ extern "C" __declspec(dllexport) int Load(void) HookEvent(ME_OPT_INITIALISE, HookedOptions);
mir_getLP(&pluginInfo);
- mir_getCLI();
+ pcli = Clist_GetInterface();
OptionsInit(&pluginOptions);
pluginOptions.hInst = g_hInst;
diff --git a/plugins/NewXstatusNotify/src/main.cpp b/plugins/NewXstatusNotify/src/main.cpp index 337a197494..98b5a307e4 100644 --- a/plugins/NewXstatusNotify/src/main.cpp +++ b/plugins/NewXstatusNotify/src/main.cpp @@ -1148,7 +1148,7 @@ static int OnShutdown(WPARAM, LPARAM) extern "C" int __declspec(dllexport) Load(void)
{
mir_getLP(&pluginInfoEx);
- mir_getCLI();
+ pcli = Clist_GetInterface();
//"Service" Hook, used when the DB settings change: we'll monitor the "status" setting.
HookEvent(ME_DB_CONTACT_SETTINGCHANGED, ContactSettingChanged);
diff --git a/plugins/New_GPG/src/init.cpp b/plugins/New_GPG/src/init.cpp index e62d46c7f5..69bcc3bf16 100644 --- a/plugins/New_GPG/src/init.cpp +++ b/plugins/New_GPG/src/init.cpp @@ -169,7 +169,7 @@ static int OnModulesLoaded(WPARAM, LPARAM) extern "C" int __declspec(dllexport) Load()
{
mir_getLP(&pluginInfo);
- mir_getCLI();
+ pcli = Clist_GetInterface();
HookEvent(ME_SYSTEM_MODULESLOADED, OnModulesLoaded);
diff --git a/plugins/Non-IM Contact/src/main.cpp b/plugins/Non-IM Contact/src/main.cpp index 24d05d97c3..10af2ee25c 100644 --- a/plugins/Non-IM Contact/src/main.cpp +++ b/plugins/Non-IM Contact/src/main.cpp @@ -118,7 +118,7 @@ IconItem icoList[] = extern "C" __declspec(dllexport) int Load()
{
mir_getLP(&pluginInfoEx);
- mir_getCLI();
+ pcli = Clist_GetInterface();
Icon_Register(g_hInst, LPGEN("Non-IM Contact"), icoList, _countof(icoList));
diff --git a/plugins/NotesAndReminders/src/main.cpp b/plugins/NotesAndReminders/src/main.cpp index 8af86244e6..fe31d8ef14 100644 --- a/plugins/NotesAndReminders/src/main.cpp +++ b/plugins/NotesAndReminders/src/main.cpp @@ -299,7 +299,7 @@ BOOL WINAPI DllMain(HINSTANCE hinst, DWORD, LPVOID) extern "C" __declspec(dllexport) int Load(void)
{
mir_getLP(&pluginInfo);
- mir_getCLI();
+ pcli = Clist_GetInterface();
hmiranda = GetModuleHandle(NULL);
INITCOMMONCONTROLSEX ctrls = { 0 };
diff --git a/plugins/Nudge/src/main.cpp b/plugins/Nudge/src/main.cpp index f429ba14c2..f2c6a65a91 100644 --- a/plugins/Nudge/src/main.cpp +++ b/plugins/Nudge/src/main.cpp @@ -321,7 +321,7 @@ int AccListChanged(WPARAM wParam, LPARAM lParam) extern "C" int __declspec(dllexport) Load(void)
{
mir_getLP(&pluginInfo);
- mir_getCLI();
+ pcli = Clist_GetInterface();
LoadIcons();
diff --git a/plugins/Ping/src/ping.cpp b/plugins/Ping/src/ping.cpp index 2255dca874..8c7f9497ab 100644 --- a/plugins/Ping/src/ping.cpp +++ b/plugins/Ping/src/ping.cpp @@ -131,7 +131,7 @@ static IconItem iconList[] = extern "C" __declspec(dllexport) int Load(void)
{
mir_getLP(&pluginInfo);
- mir_getCLI();
+ pcli = Clist_GetInterface();
use_raw_ping = false;
db_set_b(0, PLUG, "UsingRawSockets", (BYTE)use_raw_ping);
diff --git a/plugins/Popup/src/main.cpp b/plugins/Popup/src/main.cpp index 8acce626f7..b0386e5922 100644 --- a/plugins/Popup/src/main.cpp +++ b/plugins/Popup/src/main.cpp @@ -319,7 +319,7 @@ MIRAPI int Load(void) DuplicateHandle(GetCurrentProcess(), GetCurrentThread(), GetCurrentProcess(), &hMainThread, THREAD_SET_CONTEXT, FALSE, 0);
mir_getLP(&pluginInfoEx);
- mir_getCLI();
+ pcli = Clist_GetInterface();
CreateServiceFunction(MS_POPUP_GETSTATUS, GetStatus);
diff --git a/plugins/QuickContacts/src/quickcontacts.cpp b/plugins/QuickContacts/src/quickcontacts.cpp index 6f38d59d36..0fcbed5858 100644 --- a/plugins/QuickContacts/src/quickcontacts.cpp +++ b/plugins/QuickContacts/src/quickcontacts.cpp @@ -79,7 +79,7 @@ extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD) extern "C" __declspec(dllexport) int Load()
{
mir_getLP(&pluginInfo);
- mir_getCLI();
+ pcli = Clist_GetInterface();
hQSShowDialog = CreateServiceFunction(MS_QC_SHOW_DIALOG, ShowDialog);
diff --git a/plugins/QuickMessages/src/main.cpp b/plugins/QuickMessages/src/main.cpp index 267dd279b0..506fe593c1 100644 --- a/plugins/QuickMessages/src/main.cpp +++ b/plugins/QuickMessages/src/main.cpp @@ -307,7 +307,7 @@ BOOL WINAPI DllMain(HINSTANCE hinst, DWORD, LPVOID) extern "C" __declspec(dllexport) int Load(void)
{
mir_getLP(&pluginInfo);
- mir_getCLI();
+ pcli = Clist_GetInterface();
HookEvent(ME_SYSTEM_MODULESLOADED, PluginInit);
HookEvent(ME_SYSTEM_PRESHUTDOWN, PreShutdown);
diff --git a/plugins/RecentContacts/src/RecentContacts.cpp b/plugins/RecentContacts/src/RecentContacts.cpp index 499ce50241..7f973db613 100644 --- a/plugins/RecentContacts/src/RecentContacts.cpp +++ b/plugins/RecentContacts/src/RecentContacts.cpp @@ -545,7 +545,7 @@ INT_PTR ToggleIgnore (WPARAM hContact, LPARAM) extern "C" __declspec(dllexport) int Load(void)
{
mir_getLP( &pluginInfo );
- mir_getCLI();
+ pcli = Clist_GetInterface();
CoInitialize(NULL);
hWindowList = WindowList_Create();
diff --git a/plugins/SMS/src/main.cpp b/plugins/SMS/src/main.cpp index d5f135482d..839b2dc395 100644 --- a/plugins/SMS/src/main.cpp +++ b/plugins/SMS/src/main.cpp @@ -79,7 +79,7 @@ BOOL WINAPI DllMain(HINSTANCE hInstance, DWORD dwReason, LPVOID) extern "C" int __declspec(dllexport) Load(void)
{
mir_getLP(&pluginInfo);
- mir_getCLI();
+ pcli = Clist_GetInterface();
HookEvent(ME_SYSTEM_MODULESLOADED,OnModulesLoaded);
HookEvent(ME_SYSTEM_PRESHUTDOWN,OnPreShutdown);
diff --git a/plugins/Scriver/src/srmm.cpp b/plugins/Scriver/src/srmm.cpp index 7a4c33c2a4..cecb19f485 100644 --- a/plugins/Scriver/src/srmm.cpp +++ b/plugins/Scriver/src/srmm.cpp @@ -63,7 +63,7 @@ extern "C" __declspec(dllexport) int Load(void) {
// set the memory manager
mir_getLP(&pluginInfo);
- mir_getCLI();
+ pcli = Clist_GetInterface();
if (IsWinVer7Plus())
CoCreateInstance(CLSID_TaskbarList, NULL, CLSCTX_ALL, IID_ITaskbarList3, (void**)&pTaskbarInterface);
diff --git a/plugins/SecureIM/src/main.cpp b/plugins/SecureIM/src/main.cpp index b13610c08b..3e80b7db39 100644 --- a/plugins/SecureIM/src/main.cpp +++ b/plugins/SecureIM/src/main.cpp @@ -289,7 +289,7 @@ static int onShutdown(WPARAM, LPARAM) extern "C" __declspec(dllexport) int __cdecl Load(void)
{
mir_getLP(&pluginInfoEx);
- mir_getCLI();
+ pcli = Clist_GetInterface();
DisableThreadLibraryCalls(g_hInst);
diff --git a/plugins/SeenPlugin/src/main.cpp b/plugins/SeenPlugin/src/main.cpp index 5ab4b3e6eb..2261c98a46 100644 --- a/plugins/SeenPlugin/src/main.cpp +++ b/plugins/SeenPlugin/src/main.cpp @@ -86,7 +86,7 @@ static int OnShutdown(WPARAM, LPARAM) extern "C" __declspec(dllexport) int Load(void)
{
mir_getLP(&pluginInfo);
- mir_getCLI();
+ pcli = Clist_GetInterface();
g_pUserInfo = WindowList_Create();
g_hShutdownEvent = CreateEvent(0, TRUE, FALSE, 0);
diff --git a/plugins/SendScreenshotPlus/src/Main.cpp b/plugins/SendScreenshotPlus/src/Main.cpp index 2b5804e009..6866930af5 100644 --- a/plugins/SendScreenshotPlus/src/Main.cpp +++ b/plugins/SendScreenshotPlus/src/Main.cpp @@ -258,7 +258,7 @@ ATOM g_clsTargetHighlighter = 0; DLL_EXPORT int Load(void) { mir_getLP(&pluginInfo); - mir_getCLI(); + pcli = Clist_GetInterface(); INT_PTR result = CallService(MS_IMG_GETINTERFACE, FI_IF_VERSION, (LPARAM)&FIP); if (FIP == NULL || result != S_OK) { diff --git a/plugins/Sessions/Src/Main.cpp b/plugins/Sessions/Src/Main.cpp index 92a88a6a9a..d1c379893d 100644 --- a/plugins/Sessions/Src/Main.cpp +++ b/plugins/Sessions/Src/Main.cpp @@ -838,7 +838,7 @@ BOOL WINAPI DllMain(HINSTANCE hinst, DWORD, LPVOID) extern "C" __declspec(dllexport) int Load(void)
{
mir_getLP(&pluginInfo);
- mir_getCLI();
+ pcli = Clist_GetInterface();
CreateServiceFunction(MS_SESSIONS_SHOWFAVORITESMENU, BuildFavMenu);
CreateServiceFunction(MS_SESSIONS_OPENMANAGER, OpenSessionsManagerWindow);
diff --git a/plugins/ShellExt/src/main.cpp b/plugins/ShellExt/src/main.cpp index 1c16adb12d..fbb8b79131 100644 --- a/plugins/ShellExt/src/main.cpp +++ b/plugins/ShellExt/src/main.cpp @@ -162,7 +162,7 @@ STDAPI DllUnregisterServer() extern "C" __declspec(dllexport) int Load(void)
{
mir_getLP(&pluginInfoEx);
- mir_getCLI();
+ pcli = Clist_GetInterface();
InvokeThreadServer();
HookEvent(ME_OPT_INITIALISE, OnOptionsInit);
diff --git a/plugins/SimpleAR/src/Main.cpp b/plugins/SimpleAR/src/Main.cpp index 04583e3961..8f400bd1d2 100644 --- a/plugins/SimpleAR/src/Main.cpp +++ b/plugins/SimpleAR/src/Main.cpp @@ -248,7 +248,7 @@ IconItemT iconList[] = extern "C" int __declspec(dllexport)Load(void)
{
mir_getLP(&pluginInfoEx);
- mir_getCLI();
+ pcli = Clist_GetInterface();
CreateServiceFunction(protocolname"/ToggleEnable", ToggleEnable);
CreateServiceFunction(protocolname"/ToggleAutoanswer", Toggle);
diff --git a/plugins/SimpleStatusMsg/src/main.cpp b/plugins/SimpleStatusMsg/src/main.cpp index f3c15eb8ab..a0b4f95870 100644 --- a/plugins/SimpleStatusMsg/src/main.cpp +++ b/plugins/SimpleStatusMsg/src/main.cpp @@ -1800,7 +1800,7 @@ static INT_PTR sttGetAwayMessageT(WPARAM wParam, LPARAM lParam) extern "C" int __declspec(dllexport) Load(void)
{
mir_getLP(&pluginInfo);
- mir_getCLI();
+ pcli = Clist_GetInterface();
hwndSAMsgDialog = NULL;
accounts = (PROTOACCOUNTS *)mir_alloc(sizeof(PROTOACCOUNTS));
diff --git a/plugins/Spamotron/src/spamotron.cpp b/plugins/Spamotron/src/spamotron.cpp index 0394838b5a..2ae09ab0b1 100644 --- a/plugins/Spamotron/src/spamotron.cpp +++ b/plugins/Spamotron/src/spamotron.cpp @@ -509,7 +509,7 @@ extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD) extern "C" __declspec(dllexport) int Load()
{
mir_getLP(&pluginInfo);
- mir_getCLI();
+ pcli = Clist_GetInterface();
srand((unsigned)time(0));
bayesdb = NULL;
diff --git a/plugins/SplashScreen/src/main.cpp b/plugins/SplashScreen/src/main.cpp index c5eb3608f9..1f8e78f5c4 100644 --- a/plugins/SplashScreen/src/main.cpp +++ b/plugins/SplashScreen/src/main.cpp @@ -257,7 +257,7 @@ extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD miranda extern "C" int __declspec(dllexport) Load(void)
{
mir_getLP(&pluginInfo);
- mir_getCLI();
+ pcli = Clist_GetInterface();
HookEvent(ME_SYSTEM_MODULESLOADED, ModulesLoaded);
diff --git a/plugins/StatusPlugins/AdvancedAutoAway/main.cpp b/plugins/StatusPlugins/AdvancedAutoAway/main.cpp index 3488a7b2fc..e271378c20 100644 --- a/plugins/StatusPlugins/AdvancedAutoAway/main.cpp +++ b/plugins/StatusPlugins/AdvancedAutoAway/main.cpp @@ -76,7 +76,7 @@ extern "C" __declspec(dllexport) const MUUID MirandaInterfaces[] = { MIID_AUTOAW extern "C" __declspec(dllexport) int Load(void)
{
mir_getLP(&pluginInfoEx);
- mir_getCLI();
+ pcli = Clist_GetInterface();
InitCommonStatus();
hCSModuleLoadedHook = HookEvent(ME_SYSTEM_MODULESLOADED, CSModuleLoaded);
diff --git a/plugins/StatusPlugins/KeepStatus/main.cpp b/plugins/StatusPlugins/KeepStatus/main.cpp index c382d17c45..b67757838d 100644 --- a/plugins/StatusPlugins/KeepStatus/main.cpp +++ b/plugins/StatusPlugins/KeepStatus/main.cpp @@ -77,7 +77,7 @@ INT_PTR AnnounceStatusChangeService(WPARAM wParam, LPARAM lParam); extern "C" int __declspec(dllexport) Load(void)
{
mir_getLP(&pluginInfoEx);
- mir_getCLI();
+ pcli = Clist_GetInterface();
InitCommonStatus();
diff --git a/plugins/StatusPlugins/StartupStatus/main.cpp b/plugins/StatusPlugins/StartupStatus/main.cpp index bb5ceaf515..a93e7b81b1 100644 --- a/plugins/StatusPlugins/StartupStatus/main.cpp +++ b/plugins/StatusPlugins/StartupStatus/main.cpp @@ -74,7 +74,7 @@ static INT_PTR SrvGetProfile( WPARAM wParam, LPARAM lParam ) extern "C" int __declspec(dllexport) Load(void)
{
mir_getLP( &pluginInfoEx );
- mir_getCLI();
+ pcli = Clist_GetInterface();
if ( db_get_b(NULL, MODULENAME, SETTING_SETPROFILE, 1) ||
db_get_b(NULL, MODULENAME, SETTING_OFFLINECLOSE, 0))
diff --git a/plugins/StopSpamMod/src/init.cpp b/plugins/StopSpamMod/src/init.cpp index 453dc319ef..29f753168f 100755 --- a/plugins/StopSpamMod/src/init.cpp +++ b/plugins/StopSpamMod/src/init.cpp @@ -141,7 +141,7 @@ CLIST_INTERFACE *pcli; extern "C" int __declspec(dllexport) Load()
{
mir_getLP(&pluginInfoEx);
- mir_getCLI();
+ pcli = Clist_GetInterface();
CreateServiceFunction("/RemoveTmp", (MIRANDASERVICE)RemoveTmp);
HookEvent(ME_SYSTEM_MODULESLOADED, OnSystemModulesLoaded);
diff --git a/plugins/StopSpamPlus/src/stopspam.cpp b/plugins/StopSpamPlus/src/stopspam.cpp index d7c8a36953..b5c559a0e0 100644 --- a/plugins/StopSpamPlus/src/stopspam.cpp +++ b/plugins/StopSpamPlus/src/stopspam.cpp @@ -38,7 +38,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD, LPVOID) extern "C" int __declspec(dllexport) Load(void)
{
mir_getLP(&pluginInfoEx);
- mir_getCLI();
+ pcli = Clist_GetInterface();
plSets = new Settings;
diff --git a/plugins/TabSRMM/src/srmm.cpp b/plugins/TabSRMM/src/srmm.cpp index 2b6de13dfd..3f3cb18bb1 100644 --- a/plugins/TabSRMM/src/srmm.cpp +++ b/plugins/TabSRMM/src/srmm.cpp @@ -72,7 +72,7 @@ extern "C" int __declspec(dllexport) Load(void) return 1; } - mir_getCLI(); + pcli = Clist_GetInterface(); mir_getLP(&pluginInfo); SystemParametersInfo(SPI_GETICONTITLELOGFONT, sizeof(lfDefault), &lfDefault, FALSE); diff --git a/plugins/TipperYM/src/tipper.cpp b/plugins/TipperYM/src/tipper.cpp index 6fc17f394d..ac67b2a201 100644 --- a/plugins/TipperYM/src/tipper.cpp +++ b/plugins/TipperYM/src/tipper.cpp @@ -315,7 +315,7 @@ extern "C" int __declspec(dllexport) Load(void) {
CallService(MS_IMG_GETINTERFACE, FI_IF_VERSION, (LPARAM)&fii);
mir_getLP(&pluginInfoEx);
- mir_getCLI();
+ pcli = Clist_GetInterface();
iCodePage = Langpack_GetDefaultCodePage();
diff --git a/plugins/TooltipNotify/src/main.cpp b/plugins/TooltipNotify/src/main.cpp index e32673ce22..55f777e104 100644 --- a/plugins/TooltipNotify/src/main.cpp +++ b/plugins/TooltipNotify/src/main.cpp @@ -56,7 +56,7 @@ extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD) extern "C" int __declspec(dllexport) Load(void)
{
mir_getLP(&sPluginInfo);
- mir_getCLI();
+ pcli = Clist_GetInterface();
g_pTooltipNotify = new CTooltipNotify();
assert(g_pTooltipNotify!=0);
diff --git a/plugins/TopToolBar/src/main.cpp b/plugins/TopToolBar/src/main.cpp index f6470e244e..24e6fbe66d 100644 --- a/plugins/TopToolBar/src/main.cpp +++ b/plugins/TopToolBar/src/main.cpp @@ -30,7 +30,7 @@ extern "C" __declspec(dllexport) PLUGININFOEX *MirandaPluginInfoEx(DWORD) extern "C" int __declspec(dllexport) Load(void)
{
mir_getLP(&pluginInfo);
- mir_getCLI();
+ pcli = Clist_GetInterface();
LoadToolbarModule();
return 0;
diff --git a/plugins/TrafficCounter/src/TrafficCounter.cpp b/plugins/TrafficCounter/src/TrafficCounter.cpp index 04058633e6..3739e261c1 100644 --- a/plugins/TrafficCounter/src/TrafficCounter.cpp +++ b/plugins/TrafficCounter/src/TrafficCounter.cpp @@ -131,7 +131,7 @@ extern "C" int __declspec(dllexport) Load(void) {
// Получаем дескриптор языкового пакета.
mir_getLP(&pluginInfoEx);
- mir_getCLI();
+ pcli = Clist_GetInterface();
HookEvent(ME_OPT_INITIALISE, TrafficCounterOptInitialise);
HookEvent(ME_SYSTEM_MODULESLOADED, TrafficCounterModulesLoaded);
diff --git a/plugins/UserInfoEx/src/init.cpp b/plugins/UserInfoEx/src/init.cpp index 7a829f360e..f02b3c4eb3 100644 --- a/plugins/UserInfoEx/src/init.cpp +++ b/plugins/UserInfoEx/src/init.cpp @@ -168,7 +168,7 @@ extern "C" int __declspec(dllexport) Load(void) memset(&myGlobals, 0, sizeof(MGLOBAL));
// init clist interface
- mir_getCLI();
+ pcli = Clist_GetInterface();
// init freeimage interface
INT_PTR result = CALLSERVICE_NOTFOUND;
diff --git a/plugins/Variables/src/main.cpp b/plugins/Variables/src/main.cpp index 18487b361d..059f49116f 100644 --- a/plugins/Variables/src/main.cpp +++ b/plugins/Variables/src/main.cpp @@ -57,7 +57,7 @@ extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD) extern "C" int __declspec(dllexport) Load(void)
{
mir_getLP(&pluginInfoEx);
- mir_getCLI();
+ pcli = Clist_GetInterface();
LoadVarModule();
return 0;
diff --git a/plugins/Weather/src/weather.cpp b/plugins/Weather/src/weather.cpp index b3190f0b78..75ef89f777 100644 --- a/plugins/Weather/src/weather.cpp +++ b/plugins/Weather/src/weather.cpp @@ -177,7 +177,7 @@ extern "C" int __declspec(dllexport) Unload(void) extern "C" int __declspec(dllexport) Load(void)
{
mir_getLP(&pluginInfoEx);
- mir_getCLI();
+ pcli = Clist_GetInterface();
// initialize global variables
InitVar();
diff --git a/plugins/WebView/src/main.cpp b/plugins/WebView/src/main.cpp index e3beb4f848..57983be597 100644 --- a/plugins/WebView/src/main.cpp +++ b/plugins/WebView/src/main.cpp @@ -127,7 +127,7 @@ extern "C" int __declspec(dllexport) Unload(void) extern "C" int __declspec(dllexport) Load()
{
mir_getLP(&pluginInfoEx);
- mir_getCLI();
+ pcli = Clist_GetInterface();
HookEvent(ME_CLIST_DOUBLECLICKED, Doubleclick);
diff --git a/plugins/WhenWasIt/src/WhenWasIt.cpp b/plugins/WhenWasIt/src/WhenWasIt.cpp index 0fbf8a0cb0..b97c5dda1f 100644 --- a/plugins/WhenWasIt/src/WhenWasIt.cpp +++ b/plugins/WhenWasIt/src/WhenWasIt.cpp @@ -55,7 +55,7 @@ extern "C" int __declspec(dllexport) Load(void) Log("%s", "Entering function " __FUNCTION__);
mir_getLP(&pluginInfo);
- mir_getCLI();
+ pcli = Clist_GetInterface();
INITCOMMONCONTROLSEX icex;
icex.dwSize = sizeof(icex);
diff --git a/plugins/WinterSpeak/src/main.cpp b/plugins/WinterSpeak/src/main.cpp index d19d290d42..270563dd43 100644 --- a/plugins/WinterSpeak/src/main.cpp +++ b/plugins/WinterSpeak/src/main.cpp @@ -106,7 +106,7 @@ extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD miranda extern "C" __declspec(dllexport) int Load(void)
{
mir_getLP(&pluginInfo);
- mir_getCLI();
+ pcli = Clist_GetInterface();
if (!g_speak_config)
{
diff --git a/plugins/XSoundNotify/src/xsn_main.cpp b/plugins/XSoundNotify/src/xsn_main.cpp index af0d731e50..b55359a816 100644 --- a/plugins/XSoundNotify/src/xsn_main.cpp +++ b/plugins/XSoundNotify/src/xsn_main.cpp @@ -210,7 +210,7 @@ static int OnPreShutdown(WPARAM, LPARAM) extern "C" int __declspec(dllexport) Load()
{
mir_getLP(&pluginInfo);
- mir_getCLI();
+ pcli = Clist_GetInterface();
CreateServiceFunction("XSoundNotify/ContactMenuCommand", ShowDialog);
diff --git a/plugins/YAMN/src/main.cpp b/plugins/YAMN/src/main.cpp index aca078ca62..251ba8ca03 100644 --- a/plugins/YAMN/src/main.cpp +++ b/plugins/YAMN/src/main.cpp @@ -260,7 +260,7 @@ static void LoadPlugins() extern "C" int __declspec(dllexport) Load(void) { mir_getLP(&pluginInfo); - mir_getCLI(); + pcli = Clist_GetInterface(); YAMN_STATUS = ID_STATUS_OFFLINE; diff --git a/plugins/YAPP/src/yapp.cpp b/plugins/YAPP/src/yapp.cpp index 20e7d3d5c9..835748e011 100644 --- a/plugins/YAPP/src/yapp.cpp +++ b/plugins/YAPP/src/yapp.cpp @@ -216,7 +216,7 @@ int PreShutdown(WPARAM, LPARAM) extern "C" int __declspec(dllexport) Load(void)
{
mir_getLP(&pluginInfo);
- mir_getCLI();
+ pcli = Clist_GetInterface();
InitMessagePump();
InitOptions();
diff --git a/plugins/YARelay/src/main.cpp b/plugins/YARelay/src/main.cpp index c3d9ae62d6..1eba786e9e 100644 --- a/plugins/YARelay/src/main.cpp +++ b/plugins/YARelay/src/main.cpp @@ -222,7 +222,7 @@ extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD) extern "C" int __declspec(dllexport) Load()
{
mir_getLP(&pluginInfoEx);
- mir_getCLI();
+ pcli = Clist_GetInterface();
// Load plugin options from DB
hForwardFrom = (MCONTACT)db_get_dw(NULL, "yaRelay", "ForwardFrom", 0);
diff --git a/plugins/YahooGroups/src/YahooGroups.cpp b/plugins/YahooGroups/src/YahooGroups.cpp index 1af56490b7..da71a8f752 100644 --- a/plugins/YahooGroups/src/YahooGroups.cpp +++ b/plugins/YahooGroups/src/YahooGroups.cpp @@ -49,7 +49,7 @@ extern "C" __declspec(dllexport) PLUGININFOEX *MirandaPluginInfoEx(DWORD) extern "C" int __declspec(dllexport) Load()
{
mir_getLP(&pluginInfo);
- mir_getCLI();
+ pcli = Clist_GetInterface();
currentCodePage = Langpack_GetDefaultCodePage();
diff --git a/plugins/ZeroSwitch/src/ZeroSwitch.cpp b/plugins/ZeroSwitch/src/ZeroSwitch.cpp index 66263cf52f..4e1591811c 100644 --- a/plugins/ZeroSwitch/src/ZeroSwitch.cpp +++ b/plugins/ZeroSwitch/src/ZeroSwitch.cpp @@ -133,7 +133,7 @@ LRESULT CALLBACK CallWndRetProc(int nCode, WPARAM wParam, LPARAM lParam) extern "C" int __declspec(dllexport) Load(void)
{
mir_getLP(&pluginInfo);
- mir_getCLI();
+ pcli = Clist_GetInterface();
if (IsWinVerVistaPlus()) {
MessageBox(NULL, TranslateT("Plugin works under Windows XP only"), TranslateT("ZeroSwitch plugin failed"), MB_ICONSTOP);
diff --git a/plugins/wbOSD/src/main.cpp b/plugins/wbOSD/src/main.cpp index 570cbe6de5..a4ee1541bb 100644 --- a/plugins/wbOSD/src/main.cpp +++ b/plugins/wbOSD/src/main.cpp @@ -46,7 +46,7 @@ extern "C" __declspec(dllexport) PLUGININFOEX *MirandaPluginInfoEx(DWORD) extern "C" __declspec(dllexport) int Load()
{
mir_getLP(&pluginInfo);
- mir_getCLI();
+ pcli = Clist_GetInterface();
logmsg("Load");
hHookedInit = HookEvent(ME_SYSTEM_MODULESLOADED, MainInit);
diff --git a/protocols/AimOscar/src/aim.cpp b/protocols/AimOscar/src/aim.cpp index 9172347766..56ee8e3943 100644 --- a/protocols/AimOscar/src/aim.cpp +++ b/protocols/AimOscar/src/aim.cpp @@ -102,7 +102,7 @@ static int protoUninit(PROTO_INTERFACE* ppro) extern "C" int __declspec(dllexport) Load(void)
{
mir_getLP(&pluginInfo);
- mir_getCLI();
+ pcli = Clist_GetInterface();
HookEvent(ME_SYSTEM_MODULESLOADED, OnModulesLoaded);
diff --git a/protocols/Dummy/src/main.cpp b/protocols/Dummy/src/main.cpp index 8eff3f47ae..7ce977fa6d 100644 --- a/protocols/Dummy/src/main.cpp +++ b/protocols/Dummy/src/main.cpp @@ -78,7 +78,7 @@ static int dummyProtoUninit(CDummyProto *ppro) extern "C" int __declspec(dllexport) Load()
{
mir_getLP(&pluginInfo);
- mir_getCLI();
+ pcli = Clist_GetInterface();
// Register protocol module
PROTOCOLDESCRIPTOR pd = { 0 };
diff --git a/protocols/FacebookRM/src/main.cpp b/protocols/FacebookRM/src/main.cpp index 35f9477192..77c280e9af 100644 --- a/protocols/FacebookRM/src/main.cpp +++ b/protocols/FacebookRM/src/main.cpp @@ -90,7 +90,7 @@ static int protoUninit(PROTO_INTERFACE* proto) extern "C" int __declspec(dllexport) Load(void)
{
mir_getLP(&pluginInfo);
- mir_getCLI();
+ pcli = Clist_GetInterface();
PROTOCOLDESCRIPTOR pd = { 0 };
pd.cbSize = sizeof(pd);
diff --git a/protocols/GTalkExt/src/GTalkExt.cpp b/protocols/GTalkExt/src/GTalkExt.cpp index 391ebfa405..a9fe6ec4c7 100644 --- a/protocols/GTalkExt/src/GTalkExt.cpp +++ b/protocols/GTalkExt/src/GTalkExt.cpp @@ -84,7 +84,7 @@ LRESULT CALLBACK WndProc(HWND wnd, UINT msg, WPARAM wParam, LPARAM lParam) extern "C" int __declspec(dllexport) Load(void)
{
mir_getLP(&pluginInfo);
- mir_getCLI();
+ pcli = Clist_GetInterface();
WNDCLASS cls = { 0 };
cls.lpfnWndProc = WndProc;
diff --git a/protocols/Gadu-Gadu/src/gg.cpp b/protocols/Gadu-Gadu/src/gg.cpp index 88b3c060f5..b9c0fd0610 100644 --- a/protocols/Gadu-Gadu/src/gg.cpp +++ b/protocols/Gadu-Gadu/src/gg.cpp @@ -331,7 +331,7 @@ static int gg_proto_uninit(PROTO_INTERFACE *proto) extern "C" int __declspec(dllexport) Load(void)
{
mir_getLP(&pluginInfo);
- mir_getCLI();
+ pcli = Clist_GetInterface();
// Hook system events
hHookModulesLoaded = HookEvent(ME_SYSTEM_MODULESLOADED, gg_modulesloaded);
diff --git a/protocols/IRCG/src/main.cpp b/protocols/IRCG/src/main.cpp index d82a0e9b6c..b19e245e13 100644 --- a/protocols/IRCG/src/main.cpp +++ b/protocols/IRCG/src/main.cpp @@ -90,7 +90,7 @@ static int ircProtoUninit(CIrcProto *ppro) extern "C" int __declspec(dllexport) Load()
{
mir_getLP(&pluginInfo);
- mir_getCLI();
+ pcli = Clist_GetInterface();
InitIcons();
InitServers();
diff --git a/protocols/IcqOscarJ/src/init.cpp b/protocols/IcqOscarJ/src/init.cpp index f45334019b..57277b4a51 100644 --- a/protocols/IcqOscarJ/src/init.cpp +++ b/protocols/IcqOscarJ/src/init.cpp @@ -94,7 +94,7 @@ static int OnPreShutdown(WPARAM, LPARAM) extern "C" int __declspec(dllexport) Load(void)
{
mir_getLP(&pluginInfo);
- mir_getCLI();
+ pcli = Clist_GetInterface();
srand(time(NULL));
_tzset();
diff --git a/protocols/JabberG/src/jabber.cpp b/protocols/JabberG/src/jabber.cpp index 043f709274..025b0c4125 100644 --- a/protocols/JabberG/src/jabber.cpp +++ b/protocols/JabberG/src/jabber.cpp @@ -183,7 +183,7 @@ extern "C" int __declspec(dllexport) Load() {
// set the memory, lists & utf8 managers
mir_getLP(&pluginInfo);
- mir_getCLI();
+ pcli = Clist_GetInterface();
mir_getCI(NULL);
{
diff --git a/protocols/MRA/src/Mra.cpp b/protocols/MRA/src/Mra.cpp index b749ea37ee..20bfae5769 100644 --- a/protocols/MRA/src/Mra.cpp +++ b/protocols/MRA/src/Mra.cpp @@ -79,7 +79,7 @@ static int __cdecl OnPreShutdown(WPARAM, LPARAM) extern "C" __declspec(dllexport) int Load(void)
{
mir_getLP(&pluginInfoEx);
- mir_getCLI();
+ pcli = Clist_GetInterface();
IconsLoad();
InitXStatusIcons();
diff --git a/protocols/MSN/src/msn.cpp b/protocols/MSN/src/msn.cpp index 9fa392318d..2764aaca65 100644 --- a/protocols/MSN/src/msn.cpp +++ b/protocols/MSN/src/msn.cpp @@ -103,7 +103,7 @@ static int msnProtoUninit(CMsnProto* ppro) extern "C" int __declspec(dllexport) Load(void)
{
mir_getLP(&pluginInfo);
- mir_getCLI();
+ pcli = Clist_GetInterface();
HookEvent(ME_SYSTEM_MODULESLOADED, OnModulesLoaded);
diff --git a/protocols/MinecraftDynmap/src/main.cpp b/protocols/MinecraftDynmap/src/main.cpp index 09f6905e8e..634248f87d 100644 --- a/protocols/MinecraftDynmap/src/main.cpp +++ b/protocols/MinecraftDynmap/src/main.cpp @@ -90,7 +90,7 @@ static HANDLE g_hEvents[1]; extern "C" int __declspec(dllexport) Load(void) { mir_getLP(&pluginInfo); - mir_getCLI(); + pcli = Clist_GetInterface(); PROTOCOLDESCRIPTOR pd = { 0 }; pd.cbSize = sizeof(pd); diff --git a/protocols/Omegle/src/main.cpp b/protocols/Omegle/src/main.cpp index f49306a5a5..d5c442a885 100644 --- a/protocols/Omegle/src/main.cpp +++ b/protocols/Omegle/src/main.cpp @@ -92,7 +92,7 @@ static HANDLE g_hEvents[1]; extern "C" int __declspec(dllexport) Load(void)
{
mir_getLP(&pluginInfo);
- mir_getCLI();
+ pcli = Clist_GetInterface();
PROTOCOLDESCRIPTOR pd = { 0 };
pd.cbSize = sizeof(pd);
diff --git a/protocols/Sametime/src/sametime.cpp b/protocols/Sametime/src/sametime.cpp index f6baf48502..9217b49663 100644 --- a/protocols/Sametime/src/sametime.cpp +++ b/protocols/Sametime/src/sametime.cpp @@ -266,7 +266,7 @@ static int sametime_proto_uninit(PROTO_INTERFACE* ppro) extern "C" int __declspec(dllexport) Load(void)
{
mir_getLP(&pluginInfo);
- mir_getCLI();
+ pcli = Clist_GetInterface();
PROTOCOLDESCRIPTOR pd = { 0 };
pd.cbSize = sizeof(pd);
diff --git a/protocols/SkypeWeb/src/main.cpp b/protocols/SkypeWeb/src/main.cpp index 02a3f0cec4..3e5f56b471 100644 --- a/protocols/SkypeWeb/src/main.cpp +++ b/protocols/SkypeWeb/src/main.cpp @@ -57,7 +57,7 @@ extern "C" __declspec(dllexport) const MUUID MirandaInterfaces[] = { MIID_PROTOC extern "C" int __declspec(dllexport) Load(void)
{
mir_getLP(&pluginInfo);
- mir_getCLI();
+ pcli = Clist_GetInterface();
mir_getCI(nullptr);
CallService(MS_IMG_GETINTERFACE, FI_IF_VERSION, (LPARAM)&fii);
CallService(MS_SYSTEM_GETVERSIONTEXT, sizeof(g_szMirVer), LPARAM(g_szMirVer));
diff --git a/protocols/Tlen/src/tlen.cpp b/protocols/Tlen/src/tlen.cpp index d0bfbce5f4..1affd2da6e 100644 --- a/protocols/Tlen/src/tlen.cpp +++ b/protocols/Tlen/src/tlen.cpp @@ -350,7 +350,7 @@ static int tlenProtoUninit(TlenProtocol* ppro) extern "C" int __declspec(dllexport) Load(void)
{
mir_getLP(&pluginInfo);
- mir_getCLI();
+ pcli = Clist_GetInterface();
DuplicateHandle(GetCurrentProcess(), GetCurrentThread(), GetCurrentProcess(), &hMainThread, THREAD_SET_CONTEXT, FALSE, 0);
diff --git a/protocols/Tox/src/tox.cpp b/protocols/Tox/src/tox.cpp index cd67b0f8f0..10c30c14ee 100644 --- a/protocols/Tox/src/tox.cpp +++ b/protocols/Tox/src/tox.cpp @@ -40,7 +40,7 @@ extern "C" int __declspec(dllexport) Load(void) if (g_hToxLibrary == NULL)
return 0;
- mir_getCLI();
+ pcli = Clist_GetInterface();
mir_getLP(&pluginInfo);
PROTOCOLDESCRIPTOR pd = { 0 };
diff --git a/protocols/Twitter/src/main.cpp b/protocols/Twitter/src/main.cpp index dc5a40dc99..a314c60f20 100644 --- a/protocols/Twitter/src/main.cpp +++ b/protocols/Twitter/src/main.cpp @@ -86,7 +86,7 @@ static int protoUninit(PROTO_INTERFACE *proto) extern "C" int __declspec(dllexport) Load(void)
{
mir_getLP(&pluginInfo);
- mir_getCLI();
+ pcli = Clist_GetInterface();
PROTOCOLDESCRIPTOR pd = { 0 };
pd.cbSize = sizeof(pd);
diff --git a/protocols/VKontakte/src/main.cpp b/protocols/VKontakte/src/main.cpp index 37b4d45afa..65e83df76e 100644 --- a/protocols/VKontakte/src/main.cpp +++ b/protocols/VKontakte/src/main.cpp @@ -71,7 +71,7 @@ static int vkProtoUninit(CVkProto *ppro) extern "C" int __declspec(dllexport) Load()
{
mir_getLP(&pluginInfo);
- mir_getCLI();
+ pcli = Clist_GetInterface();
CallService(MS_IMG_GETINTERFACE, FI_IF_VERSION, (LPARAM)&fii);
InitIcons();
diff --git a/protocols/WhatsApp/src/main.cpp b/protocols/WhatsApp/src/main.cpp index 7cc94409ea..7905c42ccc 100644 --- a/protocols/WhatsApp/src/main.cpp +++ b/protocols/WhatsApp/src/main.cpp @@ -66,7 +66,7 @@ static int protoUninit(PROTO_INTERFACE* proto) extern "C" int __declspec(dllexport) Load(void)
{
mir_getLP(&pluginInfo);
- mir_getCLI();
+ pcli = Clist_GetInterface();
PROTOCOLDESCRIPTOR pd = { 0 };
pd.cbSize = sizeof(pd);
diff --git a/protocols/Yahoo/src/main.cpp b/protocols/Yahoo/src/main.cpp index b7c0c3ff11..f9ddf9acd7 100644 --- a/protocols/Yahoo/src/main.cpp +++ b/protocols/Yahoo/src/main.cpp @@ -97,7 +97,7 @@ static int yahooProtoUninit(CYahooProto* ppro) extern "C" int __declspec(dllexport)Load(void)
{
mir_getLP(&pluginInfo);
- mir_getCLI();
+ pcli = Clist_GetInterface();
PROTOCOLDESCRIPTOR pd = { 0 };
pd.cbSize = sizeof(pd);
diff --git a/src/core/stdauth/src/main.cpp b/src/core/stdauth/src/main.cpp index bfda91b735..c749c7e152 100644 --- a/src/core/stdauth/src/main.cpp +++ b/src/core/stdauth/src/main.cpp @@ -57,7 +57,7 @@ extern "C" __declspec(dllexport) const MUUID MirandaInterfaces[] = { MIID_SRAUTH extern "C" int __declspec(dllexport) Load(void)
{
mir_getLP(&pluginInfo);
- mir_getCLI();
+ pcli = Clist_GetInterface();
LoadSendRecvAuthModule();
return 0;
diff --git a/src/core/stdaway/src/main.cpp b/src/core/stdaway/src/main.cpp index 7e2f22e7c7..73b9d69e5b 100644 --- a/src/core/stdaway/src/main.cpp +++ b/src/core/stdaway/src/main.cpp @@ -57,7 +57,7 @@ extern "C" __declspec(dllexport) const MUUID MirandaInterfaces[] = { MIID_SRAWAY extern "C" int __declspec(dllexport) Load(void)
{
mir_getLP(&pluginInfo);
- mir_getCLI();
+ pcli = Clist_GetInterface();
LoadAwayMsgModule();
return 0;
diff --git a/src/core/stdchat/src/main.cpp b/src/core/stdchat/src/main.cpp index 07859e361a..efb3aa504a 100644 --- a/src/core/stdchat/src/main.cpp +++ b/src/core/stdchat/src/main.cpp @@ -340,7 +340,7 @@ static void TabsInit() extern "C" __declspec(dllexport) int Load(void)
{
mir_getLP(&pluginInfo);
- mir_getCLI();
+ pcli = Clist_GetInterface();
AddIcons();
RegisterFonts();
diff --git a/src/core/stdclist/src/init.cpp b/src/core/stdclist/src/init.cpp index 2373ac2c35..e9e8a9100b 100644 --- a/src/core/stdclist/src/init.cpp +++ b/src/core/stdclist/src/init.cpp @@ -133,10 +133,10 @@ static INT_PTR GetStatusMode(WPARAM, LPARAM) extern "C" __declspec(dllexport) int CListInitialise()
{
mir_getLP(&pluginInfo);
- mir_getCLI();
+ pcli = Clist_GetInterface();
- g_bSortByStatus = db_get_b(NULL, "CList", "SortByStatus", SETTING_SORTBYSTATUS_DEFAULT); - g_bSortByProto = db_get_b(NULL, "CList", "SortByProto", SETTING_SORTBYPROTO_DEFAULT); + g_bSortByStatus = db_get_b(NULL, "CList", "SortByStatus", SETTING_SORTBYSTATUS_DEFAULT);
+ g_bSortByProto = db_get_b(NULL, "CList", "SortByProto", SETTING_SORTBYPROTO_DEFAULT);
coreCli = *pcli;
pcli->hInst = g_hInst;
diff --git a/src/core/stdfile/src/main.cpp b/src/core/stdfile/src/main.cpp index d68fa833ed..d7aff5d45f 100644 --- a/src/core/stdfile/src/main.cpp +++ b/src/core/stdfile/src/main.cpp @@ -59,7 +59,7 @@ extern "C" __declspec(dllexport) const MUUID MirandaInterfaces[] = { MIID_SRFILE extern "C" int __declspec(dllexport) Load(void)
{
mir_getLP(&pluginInfo);
- mir_getCLI();
+ pcli = Clist_GetInterface();
if ( IsWinVer7Plus())
CoCreateInstance(CLSID_TaskbarList, NULL, CLSCTX_ALL, IID_ITaskbarList3, (void**)&pTaskbarInterface);
diff --git a/src/core/stdhelp/src/main.cpp b/src/core/stdhelp/src/main.cpp index 325fa65cf8..c60861c781 100644 --- a/src/core/stdhelp/src/main.cpp +++ b/src/core/stdhelp/src/main.cpp @@ -57,7 +57,7 @@ extern "C" __declspec(dllexport) const MUUID MirandaInterfaces[] = { MIID_UIHELP extern "C" int __declspec(dllexport) Load(void)
{
mir_getLP(&pluginInfo);
- mir_getCLI();
+ pcli = Clist_GetInterface();
LoadHelpModule();
return 0;
diff --git a/src/core/stdidle/src/main.cpp b/src/core/stdidle/src/main.cpp index f9edfd4ffe..ed4b18f224 100644 --- a/src/core/stdidle/src/main.cpp +++ b/src/core/stdidle/src/main.cpp @@ -58,7 +58,7 @@ extern "C" __declspec(dllexport) const MUUID MirandaInterfaces[] = { MIID_IDLE, extern "C" int __declspec(dllexport) Load(void)
{
mir_getLP(&pluginInfo);
- mir_getCLI();
+ pcli = Clist_GetInterface();
LoadIdleModule();
return 0;
diff --git a/src/core/stdmsg/src/srmm.cpp b/src/core/stdmsg/src/srmm.cpp index 8c1221fd2e..397b84676c 100644 --- a/src/core/stdmsg/src/srmm.cpp +++ b/src/core/stdmsg/src/srmm.cpp @@ -57,7 +57,7 @@ extern "C" __declspec(dllexport) const MUUID MirandaInterfaces[] = {MIID_SRMM, M extern "C" int __declspec(dllexport) Load(void)
{
mir_getLP(&pluginInfo);
- mir_getCLI();
+ pcli = Clist_GetInterface();
return LoadSendRecvMessageModule();
}
diff --git a/src/core/stduihist/src/main.cpp b/src/core/stduihist/src/main.cpp index f051bf4869..dc22f10813 100644 --- a/src/core/stduihist/src/main.cpp +++ b/src/core/stduihist/src/main.cpp @@ -57,7 +57,7 @@ extern "C" __declspec(dllexport) const MUUID MirandaInterfaces[] = { MIID_UIHIST extern "C" int __declspec(dllexport) Load(void)
{
mir_getLP(&pluginInfo);
- mir_getCLI();
+ pcli = Clist_GetInterface();
LoadHistoryModule();
return 0;
diff --git a/src/core/stduserinfo/src/main.cpp b/src/core/stduserinfo/src/main.cpp index 1c3a0c8317..2c94290564 100644 --- a/src/core/stduserinfo/src/main.cpp +++ b/src/core/stduserinfo/src/main.cpp @@ -57,7 +57,7 @@ extern "C" __declspec(dllexport) const MUUID MirandaInterfaces[] = { MIID_UIUSER extern "C" int __declspec(dllexport) Load(void)
{
mir_getLP(&pluginInfo);
- mir_getCLI();
+ pcli = Clist_GetInterface();
LoadUserInfoModule();
return 0;
diff --git a/src/core/stduseronline/src/main.cpp b/src/core/stduseronline/src/main.cpp index cfd3c55f07..ef52a01abf 100644 --- a/src/core/stduseronline/src/main.cpp +++ b/src/core/stduseronline/src/main.cpp @@ -57,7 +57,7 @@ extern "C" __declspec(dllexport) const MUUID MirandaInterfaces[] = { MIID_USERON extern "C" int __declspec(dllexport) Load(void)
{
mir_getLP(&pluginInfo);
- mir_getCLI();
+ pcli = Clist_GetInterface();
LoadUserOnlineModule();
return 0;
diff --git a/src/mir_app/src/clistcore.cpp b/src/mir_app/src/clistcore.cpp index 0f232a662e..7e16017196 100644 --- a/src/mir_app/src/clistcore.cpp +++ b/src/mir_app/src/clistcore.cpp @@ -68,7 +68,7 @@ static void fnReloadProtoMenus(void) cli.pfnCluiProtocolStatusChanged(0, 0);
}
-static INT_PTR srvRetrieveInterface(WPARAM, LPARAM)
+MIR_APP_DLL(CLIST_INTERFACE*) Clist_GetInterface(void)
{
int rc;
@@ -213,11 +213,5 @@ static INT_PTR srvRetrieveInterface(WPARAM, LPARAM) interfaceInited = 1;
}
- return (LPARAM)&cli;
-}
-
-int LoadContactListModule()
-{
- CreateServiceFunction(MS_CLIST_RETRIEVE_INTERFACE, srvRetrieveInterface);
- return 0;
+ return &cli;
}
diff --git a/src/mir_app/src/mir_app.def b/src/mir_app/src/mir_app.def index c54c104990..0eb0475b37 100644 --- a/src/mir_app/src/mir_app.def +++ b/src/mir_app/src/mir_app.def @@ -272,3 +272,4 @@ Clist_ContactChangeGroup @271 Clist_ContactCompare @272
Clist_ContactDoubleClicked @273
Clist_GetImageList @274
+Clist_GetInterface @275
diff --git a/src/mir_app/src/mir_app64.def b/src/mir_app/src/mir_app64.def index 90a51705a2..1d6f6103f9 100644 --- a/src/mir_app/src/mir_app64.def +++ b/src/mir_app/src/mir_app64.def @@ -272,3 +272,4 @@ Clist_ContactChangeGroup @271 Clist_ContactCompare @272
Clist_ContactDoubleClicked @273
Clist_GetImageList @274
+Clist_GetInterface @275
diff --git a/src/mir_app/src/modules.cpp b/src/mir_app/src/modules.cpp index 7685038d24..13e23f6411 100644 --- a/src/mir_app/src/modules.cpp +++ b/src/mir_app/src/modules.cpp @@ -42,7 +42,6 @@ int LoadEventsModule(void); int LoadSrmmModule(void);
int LoadContactsModule(void);
-int LoadContactListModule(void);// ui: clist
int LoadDatabaseModule(void);
int LoadMetacontacts(void);
int LoadOptionsModule(void); // ui: options dialog
@@ -144,7 +143,6 @@ int LoadDefaultModules(void) if (LoadProtocolsModule()) return 1;
LoadDbAccounts(); // retrieves the account array from a database
if (LoadContactsModule()) return 1;
- if (LoadContactListModule()) return 1; // prepare contact list interface
if (LoadAddContactModule()) return 1;
if (LoadMetacontacts()) return 1;
|