From 585586661d51c7673619fe7813589e24690bda58 Mon Sep 17 00:00:00 2001 From: Kirill Volinsky Date: Sun, 10 Feb 2013 12:52:38 +0000 Subject: fixed version info git-svn-id: http://svn.miranda-ng.org/main/trunk@3528 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/Clist_modern/clist_modern_11.vcxproj | 33 +++++++++------ .../Clist_modern/clist_modern_11.vcxproj.filters | 10 +++-- plugins/Clist_modern/res/resource.rc | 47 ++++----------------- plugins/Clist_modern/res/version.rc | 28 ++++++------- .../Clist_modern/src/hdr/modern_commonheaders.h | 48 ++++------------------ plugins/Clist_modern/src/hdr/modern_log.h | 2 +- plugins/Clist_modern/src/hdr/modern_statusmodes.h | 43 ------------------- plugins/Clist_modern/src/init.cpp | 31 ++++++-------- plugins/Clist_modern/src/resource.h | 3 +- plugins/Clist_modern/src/version.h | 29 +++++++------ 10 files changed, 87 insertions(+), 187 deletions(-) delete mode 100644 plugins/Clist_modern/src/hdr/modern_statusmodes.h (limited to 'plugins') diff --git a/plugins/Clist_modern/clist_modern_11.vcxproj b/plugins/Clist_modern/clist_modern_11.vcxproj index edd39e63c0..1a461bebe8 100644 --- a/plugins/Clist_modern/clist_modern_11.vcxproj +++ b/plugins/Clist_modern/clist_modern_11.vcxproj @@ -77,12 +77,13 @@ Disabled ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_DEBUG_LOG;_WINDOWS;_USRDLL;CLIST_EXPORTS;%(PreprocessorDefinitions) + WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) false EnableFastChecks MultiThreadedDebugDLL true - /J + + Use hdr/modern_commonheaders.h Level3 @@ -90,7 +91,7 @@ _DEBUG;%(PreprocessorDefinitions) - ..\..\include\msapi + ..\..\include;..\..\include\msapi MSImg32.Lib;comctl32.lib;shlwapi.lib;gdiplus.lib;%(AdditionalDependencies) @@ -106,19 +107,20 @@ Disabled ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) - WIN64;_DEBUG;_WINDOWS;_DEBUG_LOG;_USRDLL;CLIST_EXPORTS;%(PreprocessorDefinitions) + WIN64;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) false EnableFastChecks MultiThreadedDebugDLL true - /J + + Use hdr/modern_commonheaders.h Level3 _DEBUG;%(PreprocessorDefinitions) - ..\..\include\msapi + ..\..\include;..\..\include\msapi MSImg32.Lib;comctl32.lib;shlwapi.lib;gdiplus.lib;%(AdditionalDependencies) @@ -136,20 +138,21 @@ OnlyExplicitInline Size ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;CLIST_EXPORTS;%(PreprocessorDefinitions) + WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true false false true Fast - /J + + Use hdr/modern_commonheaders.h Level3 NDEBUG;%(PreprocessorDefinitions) - ..\..\include\msapi + ..\..\include;..\..\include\msapi MSImg32.Lib;comctl32.lib;shlwapi.lib;gdiplus.lib;%(AdditionalDependencies) @@ -170,12 +173,12 @@ OnlyExplicitInline Size ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) - WIN64;NDEBUG;_WINDOWS;_USRDLL;CLIST_EXPORTS;%(PreprocessorDefinitions) + WIN64;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true false true Fast - /J + Use hdr/modern_commonheaders.h Level3 @@ -183,7 +186,7 @@ NDEBUG;%(PreprocessorDefinitions) - ..\..\include\msapi + ..\..\include;..\..\include\msapi MSImg32.Lib;comctl32.lib;shlwapi.lib;gdiplus.lib;%(AdditionalDependencies) @@ -274,7 +277,6 @@ - @@ -282,11 +284,16 @@ + + + + + diff --git a/plugins/Clist_modern/clist_modern_11.vcxproj.filters b/plugins/Clist_modern/clist_modern_11.vcxproj.filters index e8e55d55be..f983c3d577 100644 --- a/plugins/Clist_modern/clist_modern_11.vcxproj.filters +++ b/plugins/Clist_modern/clist_modern_11.vcxproj.filters @@ -242,9 +242,6 @@ Header Files - - Header Files - Header Files @@ -254,6 +251,9 @@ Header Files + + Header Files + @@ -263,4 +263,8 @@ Resource Files + + + + \ No newline at end of file diff --git a/plugins/Clist_modern/res/resource.rc b/plugins/Clist_modern/res/resource.rc index 3732b6fd64..8a9beccbc4 100644 --- a/plugins/Clist_modern/res/resource.rc +++ b/plugins/Clist_modern/res/resource.rc @@ -7,18 +7,18 @@ // // Generated from the TEXTINCLUDE 2 resource. // -#include -#include "..\src\hdr\modern_statusmodes.h" +#include +#include ///////////////////////////////////////////////////////////////////////////// #undef APSTUDIO_READONLY_SYMBOLS ///////////////////////////////////////////////////////////////////////////// -// Neutral resources +// Русский (Россия) resources -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_NEU) -LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL -#pragma code_page(1252) +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_RUS) +LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT +#pragma code_page(1251) ///////////////////////////////////////////////////////////////////////////// // @@ -836,18 +836,6 @@ END #ifdef APSTUDIO_INVOKED GUIDELINES DESIGNINFO BEGIN - IDD_MODERNOPTS, DIALOG - BEGIN - END - - IDD_OPT_CLIST_LISTBKG, DIALOG - BEGIN - END - - IDD_OPT_SKIN, DIALOG - BEGIN - END - IDD_OPT_SKINEDITOR, DIALOG BEGIN TOPMARGIN, 1 @@ -861,10 +849,6 @@ BEGIN HORZGUIDE, 207 END - IDD_OPT_ITEMS, DIALOG - BEGIN - END - IDD_SKIN_TAB, DIALOG BEGIN RIGHTMARGIN, 298 @@ -1159,19 +1143,6 @@ BEGIN END -///////////////////////////////////////////////////////////////////////////// -// -// Dialog Info -// - -IDD_OPT_CLUI_2 DLGINIT -BEGIN - IDC_HIDEMETHOD, 0x403, 9, 0 -0x6f63, 0x706d, 0x656c, 0x6574, "\000" - 0 -END - - #ifdef APSTUDIO_INVOKED ///////////////////////////////////////////////////////////////////////////// // @@ -1185,8 +1156,8 @@ END 2 TEXTINCLUDE BEGIN - "#include \r\n" - "#include ""..\\src\\hdr\\modern_statusmodes.h""\r\n" + "#include \r\n" + "#include \r\n" "\0" END @@ -1198,7 +1169,7 @@ END #endif // APSTUDIO_INVOKED -#endif // Neutral resources +#endif // Русский (Россия) resources ///////////////////////////////////////////////////////////////////////////// diff --git a/plugins/Clist_modern/res/version.rc b/plugins/Clist_modern/res/version.rc index c845b1987b..5bfbab4754 100644 --- a/plugins/Clist_modern/res/version.rc +++ b/plugins/Clist_modern/res/version.rc @@ -1,36 +1,34 @@ +// Microsoft Visual C++ generated resource script. +// #ifdef APSTUDIO_INVOKED #error this file is not editable by Microsoft Visual C++ #endif //APSTUDIO_INVOKED -#include +#include "afxres.h" #include "..\src\version.h" VS_VERSION_INFO VERSIONINFO - FILEVERSION FILE_VERSION - PRODUCTVERSION PRODUCT_VERSION - FILEFLAGSMASK 0x3fL + FILEVERSION __FILEVERSION_STRING + PRODUCTVERSION __FILEVERSION_STRING + FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L #else FILEFLAGS 0x0L #endif - FILEOS 0x40004L - FILETYPE 0x1L + FILEOS 0x4L + FILETYPE 0x0L FILESUBTYPE 0x0L BEGIN BLOCK "StringFileInfo" BEGIN BLOCK "000004b0" BEGIN - VALUE "Comments", "Licensed under the terms of the GNU General Public License" - VALUE "CompanyName", " " - VALUE "FileDescription", "Miranda NG Contact List. Displays contacts, event notifications, protocol status with advantage visual modifications. Supported MW modifications, enchanced metacontact cooperation." - VALUE "FileVersion", FILE_VERSION_STR - VALUE "InternalName", "Modern Contact List" - VALUE "LegalCopyright", "Copyright © 2000-2005 Artem Shpynov, Richard Hughes, Roland Rabien, Tristan Van de Vreede, Martin Oberg, Robert Rainwater, Sam Kothari and Lyon Lim" - VALUE "OriginalFilename", "clist_modern.dll" - VALUE "ProductName", "Miranda NG Contact List. Displays contacts, event notifications, protocol status with advantage visual modifications. Supported MW modifications, enchanced metacontact cooperation." - VALUE "ProductVersion", PRODUCT_VERSION_STR + VALUE "FileDescription", __DESCRIPTION + VALUE "InternalName", __PLUGIN_NAME + VALUE "LegalCopyright", __COPYRIGHT + VALUE "OriginalFilename", __FILENAME + VALUE "ProductName", __PLUGIN_NAME END END BLOCK "VarFileInfo" diff --git a/plugins/Clist_modern/src/hdr/modern_commonheaders.h b/plugins/Clist_modern/src/hdr/modern_commonheaders.h index c085350474..a3338e4641 100644 --- a/plugins/Clist_modern/src/hdr/modern_commonheaders.h +++ b/plugins/Clist_modern/src/hdr/modern_commonheaders.h @@ -25,8 +25,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #pragma once -#define MIRANDA_VER 0x0A00 - #define _WIN32_WINNT 0x0501 #ifndef _WIN32_IE @@ -67,74 +65,46 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #define EVENTHOOK(eventhookproc) static int eventhookproc(WPARAM wParam,LPARAM lParam) #define CLINTERFACE static -#define PLUGININTERFACE extern "C" __declspec( dllexport ) -#define UPDATER_PATH "http://miranda-ng.org/" - -#include "m_stdhdr.h" - #include #include -#include -#include #include -#include #include #include -//#include #include #include -#include -#include -#include - -#include "modern_global_structure.h" +#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 "modern_global_structure.h" #include "modern_clc.h" #include "modern_clist.h" #include "modern_cluiframes.h" -#include "m_cluiframes.h" -#include "m_metacontacts.h" -#include "../m_api/m_skin_eng.h" - #include "modern_rowheight_funcs.h" #include "modern_cache_funcs.h" #include "modern_log.h" - -#include "richedit.h" -#include "m_variables.h" - -#include "m_smileyadd.h" - -#include "../m_api/m_xpTheme.h" #include "../resource.h" - #include "modern_layered_window_engine.h" // module name of MetaContacts plugin diff --git a/plugins/Clist_modern/src/hdr/modern_log.h b/plugins/Clist_modern/src/hdr/modern_log.h index 0696c280bd..d6c3b01226 100644 --- a/plugins/Clist_modern/src/hdr/modern_log.h +++ b/plugins/Clist_modern/src/hdr/modern_log.h @@ -3,7 +3,7 @@ #ifndef __LOG_H__ # define __LOG_H__ -#ifdef _DEBUG_LOG +#ifdef _DEBUG void Log(const char *file,int line,const char *fmt,...); #define logg() Log(__FILE__,__LINE__,"") diff --git a/plugins/Clist_modern/src/hdr/modern_statusmodes.h b/plugins/Clist_modern/src/hdr/modern_statusmodes.h deleted file mode 100644 index f69f97abd9..0000000000 --- a/plugins/Clist_modern/src/hdr/modern_statusmodes.h +++ /dev/null @@ -1,43 +0,0 @@ -/* - -Miranda IM: the free IM client for Microsoft* Windows* - -Copyright 2000-2008 Miranda ICQ/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. -*/ -//add 1 to ID_STATUS_CONNECTING to mark retries (v0.1.0.1+) -//eg ID_STATUS_CONNECTING+2 is the third connection attempt, or the second retry - -#pragma once - -#define ID_STATUS_CONNECTING 1 -//max retries is just a marker so that the clist knows what numbers represent -//retries. It does not set any kind of limit on the number of retries you can -//and/or should do. -#define MAX_CONNECT_RETRIES 10000 -#define ID_STATUS_OFFLINE 40071 -#define ID_STATUS_ONLINE 40072 -#define ID_STATUS_AWAY 40073 -#define ID_STATUS_DND 40074 -#define ID_STATUS_NA 40075 -#define ID_STATUS_OCCUPIED 40076 -#define ID_STATUS_FREECHAT 40077 -#define ID_STATUS_INVISIBLE 40078 -#define ID_STATUS_ONTHEPHONE 40079 -#define ID_STATUS_OUTTOLUNCH 40080 -#define ID_STATUS_IDLE 40081 /* do not use as a m_cache_nStatus */ diff --git a/plugins/Clist_modern/src/init.cpp b/plugins/Clist_modern/src/init.cpp index c8b6ed501a..02e93a3192 100644 --- a/plugins/Clist_modern/src/init.cpp +++ b/plugins/Clist_modern/src/init.cpp @@ -52,22 +52,18 @@ static HRESULT SubclassClistInterface(); static HRESULT CreateHookableEvents(); int EventArea_UnloadModule(); -__forceinline int MakeVer(int a, int b, int c, int d) -{ return PLUGIN_MAKE_VERSION(a,b,c,d); -} - PLUGININFOEX pluginInfo = { sizeof(PLUGININFOEX), - "Modern Contact List", - MakeVer(PRODUCT_VERSION), - "Displays contacts, event notifications, protocol status with advantage visual modifications. Supported MW modifications, enchanced metacontact cooperation.", - "Artem Shpynov, Ricardo Pescuma Domenecci and Anton Senko based on clist_mw by Bethoven", - "ashpynov@gmail.com" , - "Copyright 2000-2010 Miranda-IM project", - "http://miranda-ng.org/", + __PLUGIN_NAME, + PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM), + __DESCRIPTION, + __AUTHOR, + __AUTHOREMAIL, + __COPYRIGHT, + __AUTHORWEB, UNICODE_AWARE, - //{043909B6-AAD8-4d82-8EB5-9F64CFE867CD} - {0x43909b6, 0xaad8, 0x4d82, { 0x8e, 0xb5, 0x9f, 0x64, 0xcf, 0xe8, 0x67, 0xcd }} + // {043909B6-AAD8-4D82-8EB5-9F64CFE867CD} + {0x43909b6, 0xaad8, 0x4d82, {0x8e, 0xb5, 0x9f, 0x64, 0xcf, 0xe8, 0x67, 0xcd}} }; extern "C" __declspec(dllexport) const MUUID MirandaInterfaces[] = {MIID_CLIST, MIID_LAST}; @@ -79,12 +75,12 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD dwReason, LPVOID reserved) return TRUE; } -PLUGININTERFACE PLUGININFOEX* MirandaPluginInfoEx(DWORD mirandaVersion) +extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD mirandaVersion) { return &pluginInfo; } -PLUGININTERFACE int CListInitialise() +extern "C" __declspec(dllexport) int CListInitialise() { HMODULE hKernel = GetModuleHandleA("kernel32.dll"); fnTryEnterCriticalSection = ( pfnTryEnterCriticalSection )GetProcAddress( hKernel, "TryEnterCriticalSection"); @@ -118,13 +114,12 @@ PLUGININTERFACE int CListInitialise() } // never called by a newer plugin loader. -PLUGININTERFACE int Load(void) +extern "C" __declspec(dllexport) int Load(void) { - MessageBoxA(0, "You Running Old Miranda, use " MINIMAL_COREVERSION_STR " version!","Modern Clist",0); return 1; } -PLUGININTERFACE int Unload(void) +extern "C" __declspec(dllexport) int Unload(void) { TRACE("Unloading Clist Modern\r\n"); diff --git a/plugins/Clist_modern/src/resource.h b/plugins/Clist_modern/src/resource.h index a7c161cc5b..eef64ae0e5 100644 --- a/plugins/Clist_modern/src/resource.h +++ b/plugins/Clist_modern/src/resource.h @@ -1028,10 +1028,9 @@ #define POPUP_DELETEGROUP 40053 #define IDC_FRAME_META 40054 #define IDC_FRAME_META2 40055 -#define IDC_STATIC -1 // Next default values for new objects -// +// #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_NEXT_RESOURCE_VALUE 509 diff --git a/plugins/Clist_modern/src/version.h b/plugins/Clist_modern/src/version.h index 73152f4f57..a4adeb2c80 100644 --- a/plugins/Clist_modern/src/version.h +++ b/plugins/Clist_modern/src/version.h @@ -1,15 +1,14 @@ -#define BUILD_NUM 11 -#define BUILD_NUM_STR "11" - -#define COREVERSION_NUM 0, 9, 0, -#define COREVERSION_NUM_STR "0, 9, 0 " - -#define MINIMAL_COREVERSION_NUM PLUGIN_MAKE_VERSION(0, 9, 0, 0) -#define MINIMAL_COREVERSION 0, 9, 0, 0 -#define MINIMAL_COREVERSION_STR "0, 9, 0, 0 " - -#define FILE_VERSION COREVERSION_NUM BUILD_NUM -#define FILE_VERSION_STR COREVERSION_NUM_STR " build " BUILD_NUM_STR " " - -#define PRODUCT_VERSION FILE_VERSION -#define PRODUCT_VERSION_STR FILE_VERSION_STR +#define __MAJOR_VERSION 0 +#define __MINOR_VERSION 9 +#define __RELEASE_NUM 0 +#define __BUILD_NUM 11 + +#define __FILEVERSION_STRING __MAJOR_VERSION,__MINOR_VERSION,__RELEASE_NUM,__BUILD_NUM + +#define __PLUGIN_NAME "Modern contact list" +#define __FILENAME "Clist_modern.dll" +#define __DESCRIPTION "Displays contacts, event notifications, protocol status with advantage visual modifications. Supported MW modifications, enchanced metacontact cooperation." +#define __AUTHOR "Artem Shpynov, Ricardo Pescuma Domenecci and Anton Senko based on clist_mw by Bethoven" +#define __AUTHOREMAIL "ashpynov@gmail.com" +#define __AUTHORWEB "http://miranda-ng.org/" +#define __COPYRIGHT "Copyright 2000-2010 Miranda-IM project" -- cgit v1.2.3