From 5b3b0020dd6b3797a5808c7362e358df48bd4e49 Mon Sep 17 00:00:00 2001 From: Kirill Volinsky Date: Sat, 23 Jun 2012 21:06:11 +0000 Subject: Scriver: plusified git-svn-id: http://svn.miranda-ng.org/main/trunk@591 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/Scriver/srmm.cpp | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'plugins/Scriver/srmm.cpp') diff --git a/plugins/Scriver/srmm.cpp b/plugins/Scriver/srmm.cpp index d635fe47c5..41f4ceb009 100644 --- a/plugins/Scriver/srmm.cpp +++ b/plugins/Scriver/srmm.cpp @@ -56,20 +56,18 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) return TRUE; } -__declspec(dllexport) - PLUGININFOEX *MirandaPluginInfoEx(DWORD mirandaVersion) +extern "C" __declspec(dllexport) PLUGININFOEX *MirandaPluginInfoEx(DWORD mirandaVersion) { return &pluginInfo; } static const MUUID interfaces[] = {MIID_SRMM, MIID_CHAT, MIID_LAST}; -__declspec(dllexport) - const MUUID* MirandaPluginInterfaces(void) +extern "C" __declspec(dllexport) const MUUID* MirandaPluginInterfaces(void) { return interfaces; } -int __declspec(dllexport) Load(PLUGINLINK * link) +extern "C" __declspec(dllexport) int Load(PLUGINLINK * link) { pluginLink = link; @@ -81,16 +79,16 @@ int __declspec(dllexport) Load(PLUGINLINK * link) mir_getLP( &pluginInfo ); if (IsWinVer7Plus()) - CoCreateInstance(&CLSID_TaskbarList, NULL, CLSCTX_ALL, &IID_ITaskbarList3, (void**)&pTaskbarInterface); + CoCreateInstance(CLSID_TaskbarList, NULL, CLSCTX_ALL, IID_ITaskbarList3, (void**)&pTaskbarInterface); InitSendQueue(); return OnLoadModule(); } -int __declspec(dllexport) Unload(void) +extern "C" __declspec(dllexport) int Unload(void) { DestroySendQueue(); if (pTaskbarInterface) - pTaskbarInterface->lpVtbl->Release(pTaskbarInterface); + pTaskbarInterface->Release(); return OnUnloadModule(); } -- cgit v1.2.3