From 5e4ecb158a9835d79536326835287d49f22d65f1 Mon Sep 17 00:00:00 2001 From: Kirill Volinsky Date: Fri, 18 May 2012 21:25:08 +0000 Subject: compilation fixes git-svn-id: http://svn.miranda-ng.org/main/trunk@56 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/BuddyExpectator/BuddyExpectator.cpp | 4 +++- plugins/BuddyExpectator/common.h | 1 + plugins/Console/Console.c | 2 -- plugins/Console/init.c | 3 ++- plugins/ContactsPlus/main.cpp | 2 +- plugins/CountryFlags/main.c | 2 +- plugins/Dbx_tree/init.cpp | 2 +- plugins/FavContacts/favcontacts.vcxproj | 2 +- plugins/FavContacts/src/main.cpp | 2 +- plugins/FirstRun/commonheaders.h | 2 ++ plugins/FirstRun/main.c | 2 +- plugins/FlashAvatars/FlashAvatars_10.vcxproj | 1 + plugins/Gender/commonheaders.h | 2 ++ plugins/Gender/main.cpp | 4 +++- plugins/HistoryLinkListPlus/linklist.c | 2 +- plugins/ProfileManager/pmanagerEx.c | 4 +++- plugins/QuickMessages/main.c | 2 +- plugins/Rate/main.cpp | 4 +++- plugins/TooltipNotify/src/main.cpp | 6 +++--- plugins/TooltipNotify/ttnotify_10.vcxproj | 5 +---- plugins/UserGuide/commonheaders.h | 2 ++ plugins/UserGuide/main.c | 2 +- plugins/UserInfoEx/init.cpp | 2 +- plugins/VersionInfo/main.cpp | 4 ++++ plugins/clist_nicer/skineditor/main.cpp | 4 +++- plugins/dbrw/dbrw.c | 2 +- plugins/freeimage/Miranda/main.cpp | 2 -- plugins/metacontacts/meta_main.c | 2 +- plugins/updater/updater.cpp | 2 +- plugins/w7ui/main.cpp | 2 +- plugins/yapp/popups2.cpp | 2 +- 31 files changed, 48 insertions(+), 32 deletions(-) (limited to 'plugins') diff --git a/plugins/BuddyExpectator/BuddyExpectator.cpp b/plugins/BuddyExpectator/BuddyExpectator.cpp index a3f833d8c7..89c7d7af94 100644 --- a/plugins/BuddyExpectator/BuddyExpectator.cpp +++ b/plugins/BuddyExpectator/BuddyExpectator.cpp @@ -30,6 +30,7 @@ HINSTANCE hInst; PLUGINLINK *pluginLink; int hLangpack; +struct MM_INTERFACE mmi; DWORD timer_id = 0; @@ -927,7 +928,8 @@ int onSystemOKToExit(WPARAM wParam,LPARAM lParam) extern "C" int __declspec(dllexport) Load(PLUGINLINK *link) { pluginLink = link; - mir_getLP(&pluginInfoEx); + mir_getLP(&pluginInfo); + mir_getMMI(&mmi); setlocale(LC_ALL, "English"); // Set English locale diff --git a/plugins/BuddyExpectator/common.h b/plugins/BuddyExpectator/common.h index 6398727f08..2794b9e91f 100644 --- a/plugins/BuddyExpectator/common.h +++ b/plugins/BuddyExpectator/common.h @@ -26,6 +26,7 @@ #ifndef _COMMON_INC #define _COMMON_INC +#define MIRANDA_VER 0x0A00 #include // needed by m_icolib.h > r9256 #include diff --git a/plugins/Console/Console.c b/plugins/Console/Console.c index 9b09392877..96e56fa3b9 100644 --- a/plugins/Console/Console.c +++ b/plugins/Console/Console.c @@ -85,7 +85,6 @@ typedef struct { struct MM_INTERFACE mmi; struct UTF8_INTERFACE utfi; struct LIST_INTERFACE li; -int hLangpack; static SortedList lModules = {0}; @@ -1440,7 +1439,6 @@ void InitConsole() mir_getMMI(&mmi); mir_getUTFI(&utfi); mir_getLI(&li); - mir_getLP(&pluginInfoEx); lModules.sortFunc = stringCompare; lModules.increment = 5; diff --git a/plugins/Console/init.c b/plugins/Console/init.c index 56c1dd48ec..f52a8f3ae1 100644 --- a/plugins/Console/init.c +++ b/plugins/Console/init.c @@ -25,7 +25,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. PLUGINLINK *pluginLink; DWORD mirandaVer; - +int hLangpack; PLUGININFOEX pluginInfoEx={ sizeof(PLUGININFOEX), @@ -68,6 +68,7 @@ __declspec(dllexport) const MUUID* MirandaPluginInterfaces(void) int __declspec(dllexport) Load(PLUGINLINK *link) { pluginLink = link; + mir_getLP(&pluginInfoEx); if (mirandaVer < PLUGIN_MAKE_VERSION(0,8,0,3)) return -1; diff --git a/plugins/ContactsPlus/main.cpp b/plugins/ContactsPlus/main.cpp index c609129108..b312850cd9 100644 --- a/plugins/ContactsPlus/main.cpp +++ b/plugins/ContactsPlus/main.cpp @@ -324,7 +324,7 @@ extern "C" __declspec(dllexport) const MUUID* MirandaPluginInterfaces(void) extern "C" __declspec(dllexport) int Load(PLUGINLINK *link) { pluginLink = link; - mir_getLP(&pluginInfoEx); + mir_getLP(&pluginInfo); InitCommonControls(); InitI18N(); diff --git a/plugins/CountryFlags/main.c b/plugins/CountryFlags/main.c index d4b90acc6f..9db6655e33 100644 --- a/plugins/CountryFlags/main.c +++ b/plugins/CountryFlags/main.c @@ -121,7 +121,7 @@ __declspec(dllexport) const MUUID* MirandaPluginInterfaces(void) __declspec(dllexport) int Load(PLUGINLINK *link) { pluginLink=link; - mir_getLP(&pluginInfoEx); + mir_getLP(&pluginInfo); /* existance of MS_SYSTEM_GETVERSION and MS_LANGPACK_TRANSLATESTRING * is checked in MirandaPluginInfo(). diff --git a/plugins/Dbx_tree/init.cpp b/plugins/Dbx_tree/init.cpp index 72ac33c1c8..0c83f8826f 100644 --- a/plugins/Dbx_tree/init.cpp +++ b/plugins/Dbx_tree/init.cpp @@ -68,7 +68,7 @@ extern "C" __declspec(dllexport) const MUUID* MirandaPluginInterfaces(void) extern "C" __declspec(dllexport) int Load(PLUGINLINK * Link) { - mir_getLP(&pluginInfoEx); + mir_getLP(&gPluginInfoEx); return 1; } diff --git a/plugins/FavContacts/favcontacts.vcxproj b/plugins/FavContacts/favcontacts.vcxproj index 326056cef0..a12544ec93 100644 --- a/plugins/FavContacts/favcontacts.vcxproj +++ b/plugins/FavContacts/favcontacts.vcxproj @@ -52,7 +52,7 @@ Disabled - ../../include;../ExternalAPI;%(AdditionalIncludeDirectories) + ../../include;../../ExternalAPI;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;FAVCONTACTS_EXPORTS;%(PreprocessorDefinitions) true EnableFastChecks diff --git a/plugins/FavContacts/src/main.cpp b/plugins/FavContacts/src/main.cpp index 1469830e4e..53e8875657 100644 --- a/plugins/FavContacts/src/main.cpp +++ b/plugins/FavContacts/src/main.cpp @@ -321,7 +321,7 @@ extern "C" __declspec(dllexport) int Load(PLUGINLINK * link) mir_getLI(&li); mir_getMMI(&mmi); mir_getUTFI(&utfi); - mir_getLP(&pluginInfoEx); + mir_getLP(&pluginInfo); g_contactCache = new CContactCache; diff --git a/plugins/FirstRun/commonheaders.h b/plugins/FirstRun/commonheaders.h index 8fdd52a161..daf961576a 100644 --- a/plugins/FirstRun/commonheaders.h +++ b/plugins/FirstRun/commonheaders.h @@ -1,3 +1,5 @@ +#define MIRANDA_VER 0x0A00 + #include #include #include diff --git a/plugins/FirstRun/main.c b/plugins/FirstRun/main.c index b4ccc3f124..d679f8c3f6 100644 --- a/plugins/FirstRun/main.c +++ b/plugins/FirstRun/main.c @@ -60,7 +60,7 @@ __declspec(dllexport) const MUUID* MirandaPluginInterfaces(void) int __declspec(dllexport) Load(PLUGINLINK *link) { pluginLink=link; - mir_getLP(&pluginInfoEx); + mir_getLP(&pluginInfo); hModulesLoaded = HookEvent(ME_SYSTEM_MODULESLOADED,ModulesLoaded); return 0; } diff --git a/plugins/FlashAvatars/FlashAvatars_10.vcxproj b/plugins/FlashAvatars/FlashAvatars_10.vcxproj index 49ab0cff88..7bacc35466 100644 --- a/plugins/FlashAvatars/FlashAvatars_10.vcxproj +++ b/plugins/FlashAvatars/FlashAvatars_10.vcxproj @@ -155,6 +155,7 @@ %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + Create %(AdditionalIncludeDirectories) diff --git a/plugins/Gender/commonheaders.h b/plugins/Gender/commonheaders.h index ef43423b66..dd81cada93 100644 --- a/plugins/Gender/commonheaders.h +++ b/plugins/Gender/commonheaders.h @@ -26,6 +26,8 @@ #ifndef COMMHEADERS_H #define COMMHEADERS_H +#define MIRANDA_VER 0x0A00 + #include //needed by m_utils.h #include // needed by m_icolib.h > r9256 diff --git a/plugins/Gender/main.cpp b/plugins/Gender/main.cpp index 8b3d9b9bb5..b764902812 100644 --- a/plugins/Gender/main.cpp +++ b/plugins/Gender/main.cpp @@ -45,6 +45,7 @@ byte bDrawNoGenderIcon = 0; // enable icon when no info? byte bContactMenuItems = 1; // do we need a contact menu items? byte bMetaAvail = 0; // metacontacts installed? int hLangpack; +struct MM_INTERFACE mmi; extern int onOptInitialise(WPARAM wParam, LPARAM lParam); @@ -446,7 +447,8 @@ int onSystemOKToExit(WPARAM wParam,LPARAM lParam) extern "C" int __declspec(dllexport) Load(PLUGINLINK *link) { pluginLink = link; - mir_getLP(&pluginInfoEx); + mir_getLP(&pluginInfo); + mir_getMMI(&mmi); hHookModulesLoaded = HookEvent(ME_SYSTEM_MODULESLOADED, onModulesLoaded); hSystemOKToExit = HookEvent(ME_SYSTEM_OKTOEXIT,onSystemOKToExit); diff --git a/plugins/HistoryLinkListPlus/linklist.c b/plugins/HistoryLinkListPlus/linklist.c index 4798e41626..c6625dc933 100644 --- a/plugins/HistoryLinkListPlus/linklist.c +++ b/plugins/HistoryLinkListPlus/linklist.c @@ -125,7 +125,7 @@ int __declspec(dllexport) Load(PLUGINLINK *link) WNDCLASS wndclass; pluginLink = link; - mir_getLP(&pluginInfoEx); + mir_getLP(&pluginInfo); CreateServiceFunction("Linklist/MenuCommand", LinkList_Main); ZeroMemory(&linklistmenuitem, sizeof(linklistmenuitem)); linklistmenuitem.cbSize = sizeof(linklistmenuitem); diff --git a/plugins/ProfileManager/pmanagerEx.c b/plugins/ProfileManager/pmanagerEx.c index 4de242d464..f564d00849 100644 --- a/plugins/ProfileManager/pmanagerEx.c +++ b/plugins/ProfileManager/pmanagerEx.c @@ -6,6 +6,8 @@ This file is placed in the public domain. Anybody is free to use or modify it as they wish with no restriction. There is no warranty. */ +#define MIRANDA_VER 0x0A00 + #include #include #include @@ -79,7 +81,7 @@ int __declspec(dllexport) Load(PLUGINLINK *link) { CLISTMENUITEM mi; pluginLink=link; - mir_getLP(&pluginInfoEx); + mir_getLP(&pluginInfo); CreateServiceFunction("Database/LoadPM",LoadPM); ZeroMemory(&mi,sizeof(mi)); diff --git a/plugins/QuickMessages/main.c b/plugins/QuickMessages/main.c index a8e767a12d..ea6016c5c5 100644 --- a/plugins/QuickMessages/main.c +++ b/plugins/QuickMessages/main.c @@ -403,7 +403,7 @@ int __declspec(dllexport)Load(PLUGINLINK *link) pluginLink=link; mir_getMMI(&mmi); mir_getLI(&li); - mir_getLP(&pluginInfoEx); + mir_getLP(&pluginInfo); hEventDbPluginsLoaded=HookEvent(ME_SYSTEM_MODULESLOADED,PluginInit); hEventDbPreShutdown=HookEvent(ME_SYSTEM_PRESHUTDOWN,PreShutdown); diff --git a/plugins/Rate/main.cpp b/plugins/Rate/main.cpp index d3b4e767ca..e140e33d80 100644 --- a/plugins/Rate/main.cpp +++ b/plugins/Rate/main.cpp @@ -55,6 +55,7 @@ IconExtraColumn g_IECClear = {0}; int clistIcon = 0; //Icon slot to use byte bRate = 0; int hLangpack; +struct MM_INTERFACE mmi; extern int onOptInitialise(WPARAM wParam, LPARAM lParam); @@ -270,7 +271,8 @@ int onContactSettingChanged(WPARAM wParam,LPARAM lParam) extern "C" int __declspec(dllexport) Load(PLUGINLINK *link) { pluginLink=link; - mir_getLP(&pluginInfoEx); + mir_getLP(&pluginInfo); + mir_getMMI(&mmi); hHookModulesLoaded = HookEvent(ME_SYSTEM_MODULESLOADED, onModulesLoaded); hSystemOKToExit = HookEvent(ME_SYSTEM_OKTOEXIT,onSystemOKToExit); diff --git a/plugins/TooltipNotify/src/main.cpp b/plugins/TooltipNotify/src/main.cpp index a24d621f14..14af3714fe 100644 --- a/plugins/TooltipNotify/src/main.cpp +++ b/plugins/TooltipNotify/src/main.cpp @@ -80,8 +80,6 @@ extern "C" __declspec(dllexport) const MUUID* MirandaPluginInterfaces(void) return interfaces; } -extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD mirandaVersion) -{ static char szWrongUsage9x[] = "Warning! You are trying to use unicode version of the plugin on win9x system! " "It can not be working here. You must use ansi version of the plugin."; @@ -117,6 +115,8 @@ extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD miranda #endif }; +extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD mirandaVersion) +{ return &sPluginInfo; } @@ -151,7 +151,7 @@ extern "C" int __declspec(dllexport) Load(PLUGINLINK *pLink) #endif pluginLink = pLink; - mir_getLP(&pluginInfoEx); + mir_getLP(&sPluginInfo); g_pTooltipNotify = new CTooltipNotify(g_hInstDLL); assert(g_pTooltipNotify!=0); diff --git a/plugins/TooltipNotify/ttnotify_10.vcxproj b/plugins/TooltipNotify/ttnotify_10.vcxproj index 3d26822efe..94c83d42b8 100644 --- a/plugins/TooltipNotify/ttnotify_10.vcxproj +++ b/plugins/TooltipNotify/ttnotify_10.vcxproj @@ -49,10 +49,7 @@ D:\SVN\Miranda\Trunk\miranda\include;$(IncludePath) - - Updating revision... - SubWCRev . src\version.wcr src\version.h - + Disabled ../../include;../ExternalAPI;%(AdditionalIncludeDirectories) diff --git a/plugins/UserGuide/commonheaders.h b/plugins/UserGuide/commonheaders.h index 4f7479c2ef..9ef8801e05 100644 --- a/plugins/UserGuide/commonheaders.h +++ b/plugins/UserGuide/commonheaders.h @@ -1,3 +1,5 @@ +#define MIRANDA_VER 0x0A00 + #include #include #include diff --git a/plugins/UserGuide/main.c b/plugins/UserGuide/main.c index f987ce722f..95b7c6b731 100644 --- a/plugins/UserGuide/main.c +++ b/plugins/UserGuide/main.c @@ -120,7 +120,7 @@ int __declspec(dllexport) Load(PLUGINLINK *link) { pluginLink=link; mir_getMMI(&mmi); - mir_getLP(&pluginInfoEx); + mir_getLP(&pluginInfo); hModulesLoaded = HookEvent(ME_SYSTEM_MODULESLOADED,ModulesLoaded); return 0; } diff --git a/plugins/UserInfoEx/init.cpp b/plugins/UserInfoEx/init.cpp index 948611de70..9f320de376 100644 --- a/plugins/UserInfoEx/init.cpp +++ b/plugins/UserInfoEx/init.cpp @@ -312,7 +312,7 @@ extern "C" INT __declspec(dllexport) Load(PLUGINLINK *link) INITCOMMONCONTROLSEX ccEx; pluginLink = link; - mir_getLP(&pluginInfoEx); + mir_getLP(&pluginInfo); if (link && CoreCheck()) { // init common controls diff --git a/plugins/VersionInfo/main.cpp b/plugins/VersionInfo/main.cpp index 13784e8c03..8de6b6ef2c 100644 --- a/plugins/VersionInfo/main.cpp +++ b/plugins/VersionInfo/main.cpp @@ -29,6 +29,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. HINSTANCE hInst; PLUGINLINK *pluginLink; +int hLangpack; +struct MM_INTERFACE mmi; HICON hiVIIcon; @@ -94,6 +96,8 @@ extern "C" int __declspec(dllexport) Load(PLUGINLINK *link) { LogToFile("Entering %s", __FUNCTION__); pluginLink=link; + mir_getLP(&pluginInfo); + mir_getMMI(&mmi); LogToFile("Initialising services ..."); InitServices(); diff --git a/plugins/clist_nicer/skineditor/main.cpp b/plugins/clist_nicer/skineditor/main.cpp index a50ccd51ed..fc496c1cc9 100644 --- a/plugins/clist_nicer/skineditor/main.cpp +++ b/plugins/clist_nicer/skineditor/main.cpp @@ -61,6 +61,7 @@ PLUGININFOEX pluginInfo = { HINSTANCE g_hInst = 0; PLUGINLINK *pluginLink; struct MM_INTERFACE memoryManagerInterface; +int hLangpack; StatusItems_t *StatusItems; ChangedSItems_t ChangedSItems = {0}; @@ -984,7 +985,8 @@ static int systemModulesLoaded(WPARAM wParam, LPARAM lParam) extern "C" int __declspec(dllexport) Load(PLUGINLINK * link) { pluginLink = link; - return(LoadModule()); + mir_getLP(&pluginInfo); + return(LoadModule()); } static int ShutdownProc(WPARAM wParam, LPARAM lParam) diff --git a/plugins/dbrw/dbrw.c b/plugins/dbrw/dbrw.c index 79e827981a..854fa973ad 100644 --- a/plugins/dbrw/dbrw.c +++ b/plugins/dbrw/dbrw.c @@ -231,7 +231,7 @@ static int dbrw_Load(char *profile, void *link) mir_getMMI( &mmi ); mir_getLI( &li ); mir_getUTFI( &utfi ); - mir_getLP(&pluginInfoEx); + mir_getLP(&pluginInfo); { char *szLocalPath = mir_utf8encode(profile); diff --git a/plugins/freeimage/Miranda/main.cpp b/plugins/freeimage/Miranda/main.cpp index c9c7905500..804e349d7e 100644 --- a/plugins/freeimage/Miranda/main.cpp +++ b/plugins/freeimage/Miranda/main.cpp @@ -46,7 +46,6 @@ Last change by : $Author: rainwater $ #include "../Source/libpng/png.h" PLUGINLINK *pluginLink = NULL; -int hLangpack; static const PLUGININFOEX pluginInfoEx = { sizeof(PLUGININFOEX), @@ -1237,7 +1236,6 @@ static int IMGSERVICE_Load() extern "C" int __declspec(dllexport) Load(PLUGINLINK * link) { pluginLink = link; - mir_getLP(&pluginInfoEx); return IMGSERVICE_Load(); } diff --git a/plugins/metacontacts/meta_main.c b/plugins/metacontacts/meta_main.c index da442c8a01..eea5e0666e 100644 --- a/plugins/metacontacts/meta_main.c +++ b/plugins/metacontacts/meta_main.c @@ -169,7 +169,7 @@ int __declspec(dllexport)Load(PLUGINLINK *link) pluginLink=link; mir_getMMI(&mmi); - mir_getLP(&pluginInfoEx); + mir_getLP(&pluginInfo); os_unicode_enabled = IsUnicodeOS(); diff --git a/plugins/updater/updater.cpp b/plugins/updater/updater.cpp index 00d89489af..a560966c27 100644 --- a/plugins/updater/updater.cpp +++ b/plugins/updater/updater.cpp @@ -260,7 +260,7 @@ extern "C" int __declspec(dllexport) Load(PLUGINLINK *link) mir_getLI(&li); mir_getMMI(&mmi); mir_getUTFI(&utfi); - mir_getLP(&pluginInfoEx); + mir_getLP(&pluginInfo); // save global status from clist - will be restored after update check if that option is enabled, or in modules loaded if not options.start_offline = (DBGetContactSettingByte(0, MODULE, "StartOffline", 0) == 1); // load option here - rest loading in modulesloaded diff --git a/plugins/w7ui/main.cpp b/plugins/w7ui/main.cpp index 80d223e4b9..3e50ca234a 100644 --- a/plugins/w7ui/main.cpp +++ b/plugins/w7ui/main.cpp @@ -81,7 +81,7 @@ extern "C" __declspec(dllexport) int Load(PLUGINLINK * link) pluginLink = link; mir_getLI(&li); mir_getMMI(&mmi); - mir_getLP(&pluginInfoEx); + mir_getLP(&pluginInfo); LoadW7UI(); diff --git a/plugins/yapp/popups2.cpp b/plugins/yapp/popups2.cpp index 57ca16208f..3029ed709f 100644 --- a/plugins/yapp/popups2.cpp +++ b/plugins/yapp/popups2.cpp @@ -343,7 +343,7 @@ extern "C" int POPUPS2_API Load(PLUGINLINK *link) { mir_getLI(&li); mir_getMMI(&mmi); - mir_getLP(&pluginInfoEx); + mir_getLP(&pluginInfo); InitMessagePump(); InitOptions(); -- cgit v1.2.3