From 6d48c17d8555d18288c26967d8c013de36fce676 Mon Sep 17 00:00:00 2001 From: Kirill Volinsky Date: Sun, 24 Feb 2013 13:54:34 +0000 Subject: added precompiled header added version info git-svn-id: http://svn.miranda-ng.org/main/trunk@3751 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/FileAsMessage/fileecho_10.vcxproj | 29 ++++++++++----- plugins/FileAsMessage/fileecho_10.vcxproj.filters | 11 +++++- plugins/FileAsMessage/fileecho_11.vcxproj | 29 ++++++++++----- plugins/FileAsMessage/fileecho_11.vcxproj.filters | 11 +++++- plugins/FileAsMessage/res/Version.rc | 38 ++++++++++++++++++++ plugins/FileAsMessage/src/Version.h | 14 ++++++++ plugins/FileAsMessage/src/dialog.h | 3 -- plugins/FileAsMessage/src/main.cpp | 24 ++++++------- plugins/FileAsMessage/src/main.h | 43 ++++++++++------------- plugins/FileAsMessage/src/resource.h | 7 ---- plugins/FileAsMessage/src/stdafx.cpp | 18 ++++++++++ 11 files changed, 162 insertions(+), 65 deletions(-) create mode 100644 plugins/FileAsMessage/res/Version.rc create mode 100644 plugins/FileAsMessage/src/Version.h create mode 100644 plugins/FileAsMessage/src/stdafx.cpp diff --git a/plugins/FileAsMessage/fileecho_10.vcxproj b/plugins/FileAsMessage/fileecho_10.vcxproj index ac58e680df..982144fdc7 100644 --- a/plugins/FileAsMessage/fileecho_10.vcxproj +++ b/plugins/FileAsMessage/fileecho_10.vcxproj @@ -73,13 +73,15 @@ Full OnlyExplicitInline - WIN32;NDEBUG;_WINDOWS;_USRDLL;FILEECHO_EXPORTS;%(PreprocessorDefinitions) + WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true true Level3 Size - ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) + ..\..\include;%(AdditionalIncludeDirectories) false + Use + main.h comctl32.lib;%(AdditionalDependencies) @@ -101,13 +103,15 @@ Full OnlyExplicitInline - WIN64;NDEBUG;_WINDOWS;_USRDLL;FILEECHO_EXPORTS;%(PreprocessorDefinitions) + WIN64;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true true Level3 Size - ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) + ..\..\include;%(AdditionalIncludeDirectories) false + Use + main.h comctl32.lib;%(AdditionalDependencies) @@ -128,13 +132,15 @@ Disabled - WIN32;_DEBUG;_WINDOWS;_USRDLL;FILEECHO_EXPORTS;%(PreprocessorDefinitions) + WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL Level3 EditAndContinue - ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) + ..\..\include;%(AdditionalIncludeDirectories) false + Use + main.h comctl32.lib;%(AdditionalDependencies) @@ -152,12 +158,14 @@ Disabled - WIN64;_DEBUG;_WINDOWS;_USRDLL;FILEECHO_EXPORTS;%(PreprocessorDefinitions) + WIN64;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL Level3 - ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) + ..\..\include;%(AdditionalIncludeDirectories) false + Use + main.h comctl32.lib;%(AdditionalDependencies) @@ -177,14 +185,19 @@ + + Create + + + diff --git a/plugins/FileAsMessage/fileecho_10.vcxproj.filters b/plugins/FileAsMessage/fileecho_10.vcxproj.filters index 537be23e9c..8bddf08cd4 100644 --- a/plugins/FileAsMessage/fileecho_10.vcxproj.filters +++ b/plugins/FileAsMessage/fileecho_10.vcxproj.filters @@ -27,6 +27,9 @@ Source Files + + Source Files + @@ -38,10 +41,16 @@ Header Files + + Header Files + + + Resource Files + - Source Files + Resource Files \ No newline at end of file diff --git a/plugins/FileAsMessage/fileecho_11.vcxproj b/plugins/FileAsMessage/fileecho_11.vcxproj index 524bf5c5c5..c37eb88acd 100644 --- a/plugins/FileAsMessage/fileecho_11.vcxproj +++ b/plugins/FileAsMessage/fileecho_11.vcxproj @@ -77,13 +77,15 @@ Full OnlyExplicitInline - WIN32;NDEBUG;_WINDOWS;_USRDLL;FILEECHO_EXPORTS;%(PreprocessorDefinitions) + WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true true Level3 Size - ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) + ..\..\include;%(AdditionalIncludeDirectories) false + Use + main.h comctl32.lib;%(AdditionalDependencies) @@ -105,13 +107,15 @@ Full OnlyExplicitInline - WIN64;NDEBUG;_WINDOWS;_USRDLL;FILEECHO_EXPORTS;%(PreprocessorDefinitions) + WIN64;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true true Level3 Size - ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) + ..\..\include;%(AdditionalIncludeDirectories) false + Use + main.h comctl32.lib;%(AdditionalDependencies) @@ -132,13 +136,15 @@ Disabled - WIN32;_DEBUG;_WINDOWS;_USRDLL;FILEECHO_EXPORTS;%(PreprocessorDefinitions) + WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL Level3 EditAndContinue - ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) + ..\..\include;%(AdditionalIncludeDirectories) false + Use + main.h comctl32.lib;%(AdditionalDependencies) @@ -156,12 +162,14 @@ Disabled - WIN64;_DEBUG;_WINDOWS;_USRDLL;FILEECHO_EXPORTS;%(PreprocessorDefinitions) + WIN64;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL Level3 - ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) + ..\..\include;%(AdditionalIncludeDirectories) false + Use + main.h comctl32.lib;%(AdditionalDependencies) @@ -181,14 +189,19 @@ + + Create + + + diff --git a/plugins/FileAsMessage/fileecho_11.vcxproj.filters b/plugins/FileAsMessage/fileecho_11.vcxproj.filters index 537be23e9c..8bddf08cd4 100644 --- a/plugins/FileAsMessage/fileecho_11.vcxproj.filters +++ b/plugins/FileAsMessage/fileecho_11.vcxproj.filters @@ -27,6 +27,9 @@ Source Files + + Source Files + @@ -38,10 +41,16 @@ Header Files + + Header Files + + + Resource Files + - Source Files + Resource Files \ No newline at end of file diff --git a/plugins/FileAsMessage/res/Version.rc b/plugins/FileAsMessage/res/Version.rc new file mode 100644 index 0000000000..5bfbab4754 --- /dev/null +++ b/plugins/FileAsMessage/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/plugins/FileAsMessage/src/Version.h b/plugins/FileAsMessage/src/Version.h new file mode 100644 index 0000000000..439c066b73 --- /dev/null +++ b/plugins/FileAsMessage/src/Version.h @@ -0,0 +1,14 @@ +#define __MAJOR_VERSION 0 +#define __MINOR_VERSION 0 +#define __RELEASE_NUM 2 +#define __BUILD_NUM 4 + +#define __FILEVERSION_STRING __MAJOR_VERSION,__MINOR_VERSION,__RELEASE_NUM,__BUILD_NUM + +#define __PLUGIN_NAME "File as message" +#define __FILENAME "FileAsMessage.dll" +#define __DESCRIPTION "File tranfer by using the messaging services - as plain text." +#define __AUTHOR "Denis Stanishevskiy" +#define __AUTHOREMAIL "stdenformiranda@fromru.com" +#define __AUTHORWEB "http://miranda-ng.org/" +#define __COPYRIGHT "© 2004 Denis Stanishevskiy" diff --git a/plugins/FileAsMessage/src/dialog.h b/plugins/FileAsMessage/src/dialog.h index 679742c2f6..49099703de 100644 --- a/plugins/FileAsMessage/src/dialog.h +++ b/plugins/FileAsMessage/src/dialog.h @@ -1,6 +1,3 @@ -#include -#include -#include extern HINSTANCE hInst; int getMsgId(char *msg); diff --git a/plugins/FileAsMessage/src/main.cpp b/plugins/FileAsMessage/src/main.cpp index 23170b405f..3c6d397aef 100644 --- a/plugins/FileAsMessage/src/main.cpp +++ b/plugins/FileAsMessage/src/main.cpp @@ -3,16 +3,16 @@ PLUGININFOEX pluginInfo = { sizeof(PLUGININFOEX), - SERVICE_TITLE, - PLUGIN_MAKE_VERSION( 0,0,2,4 ), - "File tranfer by using the messaging services - as plain text.", - "Denis Stanishevskiy // StDenis", - "stdenformiranda(at)fromru(dot)com", - "Copyright (c) 2004, Denis Stanishevskiy", - PLUGIN_URL, + __PLUGIN_NAME, + PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM), + __DESCRIPTION, + __AUTHOR, + __AUTHOREMAIL, + __COPYRIGHT, + __AUTHORWEB, UNICODE_AWARE, // {34B5A402-1B79-4246-B041-43D0B590AE2C} - { 0x34b5a402, 0x1b79, 0x4246, { 0xb0, 0x41, 0x43, 0xd0, 0xb5, 0x90, 0xae, 0x2c } } + {0x34b5a402, 0x1b79, 0x4246, {0xb0, 0x41, 0x43, 0xd0, 0xb5, 0x90, 0xae, 0x2c}} }; HANDLE hFileList; @@ -23,8 +23,6 @@ char *szServiceTitle = SERVICE_TITLE; char *szServicePrefix = SERVICE_PREFIX; HANDLE hHookDbSettingChange, hHookContactAdded, hHookSkinIconsChanged; -extern INT_PTR CALLBACK OptionsDlgProc( HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam ); - HICON hIcons[5]; static IconItem iconList[] = @@ -119,7 +117,7 @@ INT_PTR OnSendFile(WPARAM wParam, LPARAM lParam) return 1; } -INT_PTR OnRecvMessage( WPARAM wParam, LPARAM lParam ) +INT_PTR OnRecvMessage(WPARAM wParam, LPARAM lParam) { CCSDATA *pccsd = (CCSDATA *)lParam; PROTORECVEVENT *ppre = ( PROTORECVEVENT * )pccsd->lParam; @@ -241,8 +239,8 @@ extern "C" __declspec(dllexport) int Unload(void) // // DllMain() // -int WINAPI DllMain( HINSTANCE hInstance, DWORD dwReason, LPVOID pReserved ) +int WINAPI DllMain(HINSTANCE hInstance, DWORD dwReason, LPVOID pReserved) { hInst = hInstance; - return 1; + return TRUE; } diff --git a/plugins/FileAsMessage/src/main.h b/plugins/FileAsMessage/src/main.h index 0962966a70..1eaf667d19 100644 --- a/plugins/FileAsMessage/src/main.h +++ b/plugins/FileAsMessage/src/main.h @@ -3,32 +3,27 @@ #define _WIN32_WINNT 0x0501 #include -#include -#include +#include +#include #include -#include "newpluginapi.h" -#include "m_system.h" -#include "m_database.h" -#include "m_protomod.h" -#include "m_protosvc.h" -#include "m_langpack.h" -#include "m_clist.h" -#include "m_options.h" -#include "m_clui.h" -#include "m_clc.h" -#include "m_utils.h" -#include "m_skin.h" -#include "m_popup.h" -#include "m_icolib.h" -#include "m_message.h" -#include "m_button.h" -#include "m_netlib.h" -#include "m_file.h" -#include "win2k.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include "dialog.h" #include "resource.h" +#include "version.h" #define MAXBUFSIZE 4096 #define SERVICE_TITLE LPGEN("File As Message") @@ -36,10 +31,9 @@ #define SERVICE_PREFIX "<%fAM-0023%>" -#define PLUGIN_URL "http://miranda-ng.org/" #define NOPLUGIN_MESSAGE LPGEN("\nIf you see this \"garbage\", probably you "\ "have no \"fileAsMessage\" plugin installed, see "\ - PLUGIN_URL " for more information and download.") + "http://miranda-ng.org/ for more information and download.") extern char *szServiceTitle; extern char *szServicePrefix; extern const ulong INITCRC; @@ -54,4 +48,5 @@ extern HANDLE hEventNewFile; extern HICON hIcons[5]; -ulong memcrc32(uchar *ptr, int size, ulong crc ); \ No newline at end of file +ulong memcrc32(uchar *ptr, int size, ulong crc); +INT_PTR CALLBACK OptionsDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); diff --git a/plugins/FileAsMessage/src/resource.h b/plugins/FileAsMessage/src/resource.h index b6a254dcf7..952fba4a65 100644 --- a/plugins/FileAsMessage/src/resource.h +++ b/plugins/FileAsMessage/src/resource.h @@ -3,7 +3,6 @@ // Used by resources.rc // #define IDC_PLAY 1 -#define IDD_DIALOG1 101 #define IDD_MAIN 101 #define IDI_SMALLICON 102 #define IDD_OPTIONS 103 @@ -20,17 +19,11 @@ #define IDC_FILESIZE 1008 #define IDC_LIST1 1020 #define IDC_ALPHANUM 1022 -#define IDC_HIDEDELAY 1051 #define IDC_CHUNKSIZE 1051 -#define IDC_SHOWDELAY 1052 #define IDC_SENDDELAY 1052 -#define IDC_SENTCOLOR 1053 #define IDC_UNSENT 1053 -#define IDC_SENTCOLOR2 1054 #define IDC_SENT 1054 -#define IDC_SENTCOLOR3 1055 #define IDC_TOSEND 1055 -#define IDC_SENTCOLOR4 1056 #define IDC_RECV 1056 // Next default values for new objects diff --git a/plugins/FileAsMessage/src/stdafx.cpp b/plugins/FileAsMessage/src/stdafx.cpp new file mode 100644 index 0000000000..7495950aac --- /dev/null +++ b/plugins/FileAsMessage/src/stdafx.cpp @@ -0,0 +1,18 @@ +/* +Copyright (C) 2012-13 Miranda NG Project (http://miranda-ng.org) + +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 version 2 +of the License. + +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, see . +*/ + +#include "main.h" \ No newline at end of file -- cgit v1.2.3