From 108abbb08f547e20eb30e9ddc2861ca752270020 Mon Sep 17 00:00:00 2001 From: Kirill Volinsky Date: Thu, 25 Dec 2014 18:09:14 +0000 Subject: files structure changed git-svn-id: http://svn.miranda-ng.org/main/trunk@11628 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- src/core/stdautoaway/autoaway.cpp | 116 --------------------- src/core/stdautoaway/commonheaders.cpp | 2 - src/core/stdautoaway/commonheaders.h | 77 -------------- src/core/stdautoaway/main.cpp | 67 ------------ src/core/stdautoaway/res/resource.rc | 66 ++++++++++++ src/core/stdautoaway/res/version.rc | 38 +++++++ src/core/stdautoaway/resource.rc | 66 ------------ src/core/stdautoaway/src/autoaway.cpp | 116 +++++++++++++++++++++ src/core/stdautoaway/src/commonheaders.cpp | 2 + src/core/stdautoaway/src/commonheaders.h | 77 ++++++++++++++ src/core/stdautoaway/src/main.cpp | 67 ++++++++++++ src/core/stdautoaway/src/version.h | 12 +++ src/core/stdautoaway/stdautoaway_10.vcxproj | 18 ++-- .../stdautoaway/stdautoaway_10.vcxproj.filters | 15 +-- src/core/stdautoaway/stdautoaway_12.vcxproj | 18 ++-- .../stdautoaway/stdautoaway_12.vcxproj.filters | 15 +-- src/core/stdautoaway/version.h | 14 --- src/core/stdautoaway/version.rc | 42 -------- 18 files changed, 412 insertions(+), 416 deletions(-) delete mode 100644 src/core/stdautoaway/autoaway.cpp delete mode 100644 src/core/stdautoaway/commonheaders.cpp delete mode 100644 src/core/stdautoaway/commonheaders.h delete mode 100644 src/core/stdautoaway/main.cpp create mode 100644 src/core/stdautoaway/res/resource.rc create mode 100644 src/core/stdautoaway/res/version.rc delete mode 100644 src/core/stdautoaway/resource.rc create mode 100644 src/core/stdautoaway/src/autoaway.cpp create mode 100644 src/core/stdautoaway/src/commonheaders.cpp create mode 100644 src/core/stdautoaway/src/commonheaders.h create mode 100644 src/core/stdautoaway/src/main.cpp create mode 100644 src/core/stdautoaway/src/version.h delete mode 100644 src/core/stdautoaway/version.h delete mode 100644 src/core/stdautoaway/version.rc (limited to 'src/core/stdautoaway') diff --git a/src/core/stdautoaway/autoaway.cpp b/src/core/stdautoaway/autoaway.cpp deleted file mode 100644 index f515a26ad8..0000000000 --- a/src/core/stdautoaway/autoaway.cpp +++ /dev/null @@ -1,116 +0,0 @@ -/* - -Miranda NG: the free IM client for Microsoft* Windows* - -Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org), -Copyright (c) 2000-12 Miranda IM project, -all portions of this codebase are copyrighted to the people -listed in contributors.txt. - -This program is free software; you can redistribute it and/or -modify it under the terms of the GNU General Public License -as published by the Free Software Foundation; either version 2 -of the License, or (at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -*/ - -#include "commonheaders.h" - -#define AA_MODULE "AutoAway" - -static int iBreakSounds = 0; - -static int AutoAwaySound(WPARAM, LPARAM lParam) -{ - return iBreakSounds; -} - -/////////////////////////////////////////////////////////////////////////////// - -static bool Proto_IsAccountEnabled(PROTOACCOUNT *pa) -{ - return pa && ((pa->bIsEnabled && !pa->bDynDisabled) || pa->bOldProto); -} - -static bool Proto_IsAccountLocked(PROTOACCOUNT *pa) -{ - return pa && db_get_b(NULL, pa->szModuleName, "LockMainStatus", 0) != 0; -} - -static void Proto_SetStatus(const char* szProto, unsigned status) -{ - if (CallProtoService(szProto, PS_GETCAPS, PFLAGNUM_1, 0) & PF1_MODEMSGSEND) { - TCHAR *awayMsg = (TCHAR*)CallService(MS_AWAYMSG_GETSTATUSMSGW, status, (LPARAM)szProto); - CallProtoService(szProto, PS_SETAWAYMSGT, status, (LPARAM)awayMsg); - mir_free(awayMsg); - } - - CallProtoService(szProto, PS_SETSTATUS, status, 0); -} - -static int AutoAwayEvent(WPARAM, LPARAM lParam) -{ - MIRANDA_IDLE_INFO mii = { sizeof(mii) }; - CallService(MS_IDLE_GETIDLEINFO, 0, (LPARAM)&mii); - - if (mii.idlesoundsoff) - iBreakSounds = (lParam & IDF_ISIDLE) != 0; - - // we don't need to switch the status - if (mii.aaStatus == 0) - return 0; - - int numAccounts; - PROTOACCOUNT** accounts; - ProtoEnumAccounts(&numAccounts, &accounts); - - for (int i = 0; i < numAccounts; i++) { - PROTOACCOUNT *pa = accounts[i]; - if (!Proto_IsAccountEnabled(pa) || Proto_IsAccountLocked(pa)) - continue; - - int currentstatus = CallProtoService(pa->szModuleName, PS_GETSTATUS, 0, 0); - int statusbits = CallProtoService(pa->szModuleName, PS_GETCAPS, PFLAGNUM_2, 0); - int status = mii.aaStatus; - if (!(statusbits & Proto_Status2Flag(status))) { - // the protocol doesnt support the given status - if (statusbits & Proto_Status2Flag(ID_STATUS_AWAY)) - status = ID_STATUS_AWAY; - } - if (lParam & IDF_ISIDLE) { - if (currentstatus != ID_STATUS_ONLINE && currentstatus != ID_STATUS_FREECHAT) - continue; - - // save old status of account and set to given status - db_set_w(NULL, AA_MODULE, pa->szModuleName, currentstatus); - Proto_SetStatus(pa->szModuleName, status); - } - else { - int oldstatus = db_get_w(NULL, AA_MODULE, pa->szModuleName, 0); - if (oldstatus != ID_STATUS_ONLINE && oldstatus != ID_STATUS_FREECHAT) - continue; - - // returning from idle and this accout was set away, set it back - db_unset(NULL, AA_MODULE, pa->szModuleName); - if (!mii.aaLock) - Proto_SetStatus(pa->szModuleName, oldstatus); - } - } - - return 0; -} - -int LoadAutoAwayModule() -{ - HookEvent(ME_SKIN_PLAYINGSOUND, AutoAwaySound); - HookEvent(ME_IDLE_CHANGED, AutoAwayEvent); - return 0; -} diff --git a/src/core/stdautoaway/commonheaders.cpp b/src/core/stdautoaway/commonheaders.cpp deleted file mode 100644 index 95b2201163..0000000000 --- a/src/core/stdautoaway/commonheaders.cpp +++ /dev/null @@ -1,2 +0,0 @@ -#include "commonheaders.h" - diff --git a/src/core/stdautoaway/commonheaders.h b/src/core/stdautoaway/commonheaders.h deleted file mode 100644 index b11a377e25..0000000000 --- a/src/core/stdautoaway/commonheaders.h +++ /dev/null @@ -1,77 +0,0 @@ -/* - -Miranda NG: the free IM client for Microsoft* Windows* - -Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org), -Copyright (c) 2000-12 Miranda IM project, -all portions of this codebase are copyrighted to the people -listed in contributors.txt. - -This program is free software; you can redistribute it and/or -modify it under the terms of the GNU General Public License -as published by the Free Software Foundation; either version 2 -of the License, or (at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -*/ - -#define WINVER 0x0700 -#define _WIN32_WINNT 0x0700 -#define _WIN32_IE 0x0601 - -#include -#include -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "version.h" - -#include "../../resource.h" -#include "../stdplug.h" - -extern HINSTANCE hInst; diff --git a/src/core/stdautoaway/main.cpp b/src/core/stdautoaway/main.cpp deleted file mode 100644 index f7e964e396..0000000000 --- a/src/core/stdautoaway/main.cpp +++ /dev/null @@ -1,67 +0,0 @@ -/* - -Standard auto away module for Miranda NG - -Copyright (C) 2012-14 George Hazan - -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License along -with this program; if not, write to the Free Software Foundation, Inc., -51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -*/ - -#include "commonheaders.h" - -int LoadAutoAwayModule(void); - -HINSTANCE hInst; -int hLangpack; - -PLUGININFOEX pluginInfo = { - sizeof(PLUGININFOEX), - __PLUGIN_NAME, - MIRANDA_VERSION_DWORD, - __DESCRIPTION, - __AUTHOR, - __AUTHOREMAIL, - __COPYRIGHT, - __AUTHORWEB, - UNICODE_AWARE, - // 9f5ca736-1108-4872-bec3-19c84bc2143b - { 0x9f5ca736, 0x1108, 0x4872, {0xbe, 0xc3, 0x19, 0xc8, 0x4b, 0xc2, 0x14, 0x3b}} -}; - -BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) -{ - hInst = hinstDLL; - return TRUE; -} - -extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD mirandaVersion) -{ - return &pluginInfo; -} - -extern "C" __declspec(dllexport) const MUUID MirandaInterfaces[] = { MIID_AUTOAWAY, MIID_LAST }; - -extern "C" int __declspec(dllexport) Load(void) -{ - mir_getLP(&pluginInfo); - - LoadAutoAwayModule(); - return 0; -} - -extern "C" int __declspec(dllexport) Unload(void) -{ - return 0; -} diff --git a/src/core/stdautoaway/res/resource.rc b/src/core/stdautoaway/res/resource.rc new file mode 100644 index 0000000000..5bb57eb276 --- /dev/null +++ b/src/core/stdautoaway/res/resource.rc @@ -0,0 +1,66 @@ +// Microsoft Visual C++ generated resource script. +// +#include "..\..\resource.h" + +#define APSTUDIO_READONLY_SYMBOLS +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 2 resource. +// +#include +#include + +///////////////////////////////////////////////////////////////////////////// +#undef APSTUDIO_READONLY_SYMBOLS + +///////////////////////////////////////////////////////////////////////////// +// English (United States) resources + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US +#pragma code_page(1252) + +///////////////////////////////////////////////////////////////////////////// +// +// Dialog +// + +#endif // APSTUDIO_INVOKED + +///////////////////////////////////////////////////////////////////////////// +// +// DESIGNINFO +// + +#ifdef APSTUDIO_INVOKED +GUIDELINES DESIGNINFO +BEGIN +END +#endif // APSTUDIO_INVOKED + + +#ifdef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// TEXTINCLUDE +// + +1 TEXTINCLUDE +BEGIN + "..\..\resource.h\0" +END + +2 TEXTINCLUDE +BEGIN + "#include \r\n" + "#include \r\n" + "\0" +END + +3 TEXTINCLUDE +BEGIN + "\r\n" + "\0" +END + +#endif // APSTUDIO_INVOKED diff --git a/src/core/stdautoaway/res/version.rc b/src/core/stdautoaway/res/version.rc new file mode 100644 index 0000000000..5bfbab4754 --- /dev/null +++ b/src/core/stdautoaway/res/version.rc @@ -0,0 +1,38 @@ +// Microsoft Visual C++ generated resource script. +// +#ifdef APSTUDIO_INVOKED +#error this file is not editable by Microsoft Visual C++ +#endif //APSTUDIO_INVOKED + +#include "afxres.h" +#include "..\src\version.h" + +VS_VERSION_INFO VERSIONINFO + FILEVERSION __FILEVERSION_STRING + PRODUCTVERSION __FILEVERSION_STRING + FILEFLAGSMASK 0x17L +#ifdef _DEBUG + FILEFLAGS 0x1L +#else + FILEFLAGS 0x0L +#endif + FILEOS 0x4L + FILETYPE 0x0L + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "000004b0" + BEGIN + VALUE "FileDescription", __DESCRIPTION + VALUE "InternalName", __PLUGIN_NAME + VALUE "LegalCopyright", __COPYRIGHT + VALUE "OriginalFilename", __FILENAME + VALUE "ProductName", __PLUGIN_NAME + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x0, 1200 + END +END diff --git a/src/core/stdautoaway/resource.rc b/src/core/stdautoaway/resource.rc deleted file mode 100644 index 5bb57eb276..0000000000 --- a/src/core/stdautoaway/resource.rc +++ /dev/null @@ -1,66 +0,0 @@ -// Microsoft Visual C++ generated resource script. -// -#include "..\..\resource.h" - -#define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 2 resource. -// -#include -#include - -///////////////////////////////////////////////////////////////////////////// -#undef APSTUDIO_READONLY_SYMBOLS - -///////////////////////////////////////////////////////////////////////////// -// English (United States) resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -#pragma code_page(1252) - -///////////////////////////////////////////////////////////////////////////// -// -// Dialog -// - -#endif // APSTUDIO_INVOKED - -///////////////////////////////////////////////////////////////////////////// -// -// DESIGNINFO -// - -#ifdef APSTUDIO_INVOKED -GUIDELINES DESIGNINFO -BEGIN -END -#endif // APSTUDIO_INVOKED - - -#ifdef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// TEXTINCLUDE -// - -1 TEXTINCLUDE -BEGIN - "..\..\resource.h\0" -END - -2 TEXTINCLUDE -BEGIN - "#include \r\n" - "#include \r\n" - "\0" -END - -3 TEXTINCLUDE -BEGIN - "\r\n" - "\0" -END - -#endif // APSTUDIO_INVOKED diff --git a/src/core/stdautoaway/src/autoaway.cpp b/src/core/stdautoaway/src/autoaway.cpp new file mode 100644 index 0000000000..f515a26ad8 --- /dev/null +++ b/src/core/stdautoaway/src/autoaway.cpp @@ -0,0 +1,116 @@ +/* + +Miranda NG: the free IM client for Microsoft* Windows* + +Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org), +Copyright (c) 2000-12 Miranda IM project, +all portions of this codebase are copyrighted to the people +listed in contributors.txt. + +This program is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License +as published by the Free Software Foundation; either version 2 +of the License, or (at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +*/ + +#include "commonheaders.h" + +#define AA_MODULE "AutoAway" + +static int iBreakSounds = 0; + +static int AutoAwaySound(WPARAM, LPARAM lParam) +{ + return iBreakSounds; +} + +/////////////////////////////////////////////////////////////////////////////// + +static bool Proto_IsAccountEnabled(PROTOACCOUNT *pa) +{ + return pa && ((pa->bIsEnabled && !pa->bDynDisabled) || pa->bOldProto); +} + +static bool Proto_IsAccountLocked(PROTOACCOUNT *pa) +{ + return pa && db_get_b(NULL, pa->szModuleName, "LockMainStatus", 0) != 0; +} + +static void Proto_SetStatus(const char* szProto, unsigned status) +{ + if (CallProtoService(szProto, PS_GETCAPS, PFLAGNUM_1, 0) & PF1_MODEMSGSEND) { + TCHAR *awayMsg = (TCHAR*)CallService(MS_AWAYMSG_GETSTATUSMSGW, status, (LPARAM)szProto); + CallProtoService(szProto, PS_SETAWAYMSGT, status, (LPARAM)awayMsg); + mir_free(awayMsg); + } + + CallProtoService(szProto, PS_SETSTATUS, status, 0); +} + +static int AutoAwayEvent(WPARAM, LPARAM lParam) +{ + MIRANDA_IDLE_INFO mii = { sizeof(mii) }; + CallService(MS_IDLE_GETIDLEINFO, 0, (LPARAM)&mii); + + if (mii.idlesoundsoff) + iBreakSounds = (lParam & IDF_ISIDLE) != 0; + + // we don't need to switch the status + if (mii.aaStatus == 0) + return 0; + + int numAccounts; + PROTOACCOUNT** accounts; + ProtoEnumAccounts(&numAccounts, &accounts); + + for (int i = 0; i < numAccounts; i++) { + PROTOACCOUNT *pa = accounts[i]; + if (!Proto_IsAccountEnabled(pa) || Proto_IsAccountLocked(pa)) + continue; + + int currentstatus = CallProtoService(pa->szModuleName, PS_GETSTATUS, 0, 0); + int statusbits = CallProtoService(pa->szModuleName, PS_GETCAPS, PFLAGNUM_2, 0); + int status = mii.aaStatus; + if (!(statusbits & Proto_Status2Flag(status))) { + // the protocol doesnt support the given status + if (statusbits & Proto_Status2Flag(ID_STATUS_AWAY)) + status = ID_STATUS_AWAY; + } + if (lParam & IDF_ISIDLE) { + if (currentstatus != ID_STATUS_ONLINE && currentstatus != ID_STATUS_FREECHAT) + continue; + + // save old status of account and set to given status + db_set_w(NULL, AA_MODULE, pa->szModuleName, currentstatus); + Proto_SetStatus(pa->szModuleName, status); + } + else { + int oldstatus = db_get_w(NULL, AA_MODULE, pa->szModuleName, 0); + if (oldstatus != ID_STATUS_ONLINE && oldstatus != ID_STATUS_FREECHAT) + continue; + + // returning from idle and this accout was set away, set it back + db_unset(NULL, AA_MODULE, pa->szModuleName); + if (!mii.aaLock) + Proto_SetStatus(pa->szModuleName, oldstatus); + } + } + + return 0; +} + +int LoadAutoAwayModule() +{ + HookEvent(ME_SKIN_PLAYINGSOUND, AutoAwaySound); + HookEvent(ME_IDLE_CHANGED, AutoAwayEvent); + return 0; +} diff --git a/src/core/stdautoaway/src/commonheaders.cpp b/src/core/stdautoaway/src/commonheaders.cpp new file mode 100644 index 0000000000..95b2201163 --- /dev/null +++ b/src/core/stdautoaway/src/commonheaders.cpp @@ -0,0 +1,2 @@ +#include "commonheaders.h" + diff --git a/src/core/stdautoaway/src/commonheaders.h b/src/core/stdautoaway/src/commonheaders.h new file mode 100644 index 0000000000..b11a377e25 --- /dev/null +++ b/src/core/stdautoaway/src/commonheaders.h @@ -0,0 +1,77 @@ +/* + +Miranda NG: the free IM client for Microsoft* Windows* + +Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org), +Copyright (c) 2000-12 Miranda IM project, +all portions of this codebase are copyrighted to the people +listed in contributors.txt. + +This program is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License +as published by the Free Software Foundation; either version 2 +of the License, or (at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +*/ + +#define WINVER 0x0700 +#define _WIN32_WINNT 0x0700 +#define _WIN32_IE 0x0601 + +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "version.h" + +#include "../../resource.h" +#include "../stdplug.h" + +extern HINSTANCE hInst; diff --git a/src/core/stdautoaway/src/main.cpp b/src/core/stdautoaway/src/main.cpp new file mode 100644 index 0000000000..f7e964e396 --- /dev/null +++ b/src/core/stdautoaway/src/main.cpp @@ -0,0 +1,67 @@ +/* + +Standard auto away module for Miranda NG + +Copyright (C) 2012-14 George Hazan + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License along +with this program; if not, write to the Free Software Foundation, Inc., +51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +*/ + +#include "commonheaders.h" + +int LoadAutoAwayModule(void); + +HINSTANCE hInst; +int hLangpack; + +PLUGININFOEX pluginInfo = { + sizeof(PLUGININFOEX), + __PLUGIN_NAME, + MIRANDA_VERSION_DWORD, + __DESCRIPTION, + __AUTHOR, + __AUTHOREMAIL, + __COPYRIGHT, + __AUTHORWEB, + UNICODE_AWARE, + // 9f5ca736-1108-4872-bec3-19c84bc2143b + { 0x9f5ca736, 0x1108, 0x4872, {0xbe, 0xc3, 0x19, 0xc8, 0x4b, 0xc2, 0x14, 0x3b}} +}; + +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) +{ + hInst = hinstDLL; + return TRUE; +} + +extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD mirandaVersion) +{ + return &pluginInfo; +} + +extern "C" __declspec(dllexport) const MUUID MirandaInterfaces[] = { MIID_AUTOAWAY, MIID_LAST }; + +extern "C" int __declspec(dllexport) Load(void) +{ + mir_getLP(&pluginInfo); + + LoadAutoAwayModule(); + return 0; +} + +extern "C" int __declspec(dllexport) Unload(void) +{ + return 0; +} diff --git a/src/core/stdautoaway/src/version.h b/src/core/stdautoaway/src/version.h new file mode 100644 index 0000000000..11410338d2 --- /dev/null +++ b/src/core/stdautoaway/src/version.h @@ -0,0 +1,12 @@ +#include + +#define __FILEVERSION_STRING MIRANDA_VERSION_FILEVERSION +#define __VERSION_STRING MIRANDA_VERSION_STRING + +#define __PLUGIN_NAME "Standard AutoAway module" +#define __FILENAME "stdautoaway.dll" +#define __DESCRIPTION "Core module for away state processing." +#define __AUTHOR "Miranda NG Development Team" +#define __AUTHOREMAIL "" +#define __AUTHORWEB "http://miranda-ng.org/p/StdAutoAway/" +#define __COPYRIGHT "© 2012 Miranda NG Development Team" diff --git a/src/core/stdautoaway/stdautoaway_10.vcxproj b/src/core/stdautoaway/stdautoaway_10.vcxproj index 97eef7b386..5179cb23f3 100644 --- a/src/core/stdautoaway/stdautoaway_10.vcxproj +++ b/src/core/stdautoaway/stdautoaway_10.vcxproj @@ -199,22 +199,20 @@ - - - Create - Create - Create - Create + + + Create - + - + + - - + + diff --git a/src/core/stdautoaway/stdautoaway_10.vcxproj.filters b/src/core/stdautoaway/stdautoaway_10.vcxproj.filters index 70d31c369a..92dada9114 100644 --- a/src/core/stdautoaway/stdautoaway_10.vcxproj.filters +++ b/src/core/stdautoaway/stdautoaway_10.vcxproj.filters @@ -15,29 +15,32 @@ - + Source Files - + Source Files - + Source Files - + Header Files Header Files + + Header Files + - + Resource Files - + Resource Files diff --git a/src/core/stdautoaway/stdautoaway_12.vcxproj b/src/core/stdautoaway/stdautoaway_12.vcxproj index 2415df2f36..a99c2eff28 100644 --- a/src/core/stdautoaway/stdautoaway_12.vcxproj +++ b/src/core/stdautoaway/stdautoaway_12.vcxproj @@ -202,22 +202,20 @@ - - - Create - Create - Create - Create + + + Create - + - + + - - + + diff --git a/src/core/stdautoaway/stdautoaway_12.vcxproj.filters b/src/core/stdautoaway/stdautoaway_12.vcxproj.filters index 70d31c369a..92dada9114 100644 --- a/src/core/stdautoaway/stdautoaway_12.vcxproj.filters +++ b/src/core/stdautoaway/stdautoaway_12.vcxproj.filters @@ -15,29 +15,32 @@ - + Source Files - + Source Files - + Source Files - + Header Files Header Files + + Header Files + - + Resource Files - + Resource Files diff --git a/src/core/stdautoaway/version.h b/src/core/stdautoaway/version.h deleted file mode 100644 index 885e142b57..0000000000 --- a/src/core/stdautoaway/version.h +++ /dev/null @@ -1,14 +0,0 @@ - -#include - -#define __FILEVERSION_STRING MIRANDA_VERSION_FILEVERSION -#define __VERSION_STRING MIRANDA_VERSION_STRING - -#define __PLUGIN_NAME "Standard AutoAway module" -#define __INTERNAL_NAME "stdautoaway" -#define __FILENAME "stdautoaway.dll" -#define __DESCRIPTION "Core module for away state processing." -#define __AUTHOR "Miranda NG Development Team" -#define __AUTHOREMAIL "" -#define __AUTHORWEB "http://miranda-ng.org/p/StdAutoAway/" -#define __COPYRIGHT "© 2012 Miranda NG Development Team" diff --git a/src/core/stdautoaway/version.rc b/src/core/stdautoaway/version.rc deleted file mode 100644 index d1da5e8d6a..0000000000 --- a/src/core/stdautoaway/version.rc +++ /dev/null @@ -1,42 +0,0 @@ -// Microsoft Visual C++ generated resource script. -// -#ifdef APSTUDIO_INVOKED -#error this file is not editable by Microsoft Visual C++ -#endif //APSTUDIO_INVOKED - -#include "afxres.h" -#include "version.h" - -#ifdef _WIN32 -LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL -#endif //_WIN32 - -VS_VERSION_INFO VERSIONINFO - FILEVERSION __FILEVERSION_STRING - PRODUCTVERSION __FILEVERSION_STRING - FILEFLAGSMASK 0x17L -#ifdef _DEBUG - FILEFLAGS 0x1L -#else - FILEFLAGS 0x0L -#endif - FILEOS 0x4L - FILETYPE 0x0L - FILESUBTYPE 0x0L -BEGIN - BLOCK "StringFileInfo" - BEGIN - BLOCK "000004b0" - BEGIN - VALUE "FileDescription", __DESCRIPTION - VALUE "InternalName", __PLUGIN_NAME - VALUE "LegalCopyright", __COPYRIGHT - VALUE "OriginalFilename", __FILENAME - VALUE "ProductName", __PLUGIN_NAME - END - END - BLOCK "VarFileInfo" - BEGIN - VALUE "Translation", 0x0, 1200 - END -END -- cgit v1.2.3