From 7661154c6360c2b9ff10dc536fe029323f7a96cb Mon Sep 17 00:00:00 2001 From: Vadim Dashevskiy Date: Sat, 25 Apr 2015 16:48:30 +0000 Subject: Console - common project git-svn-id: http://svn.miranda-ng.org/main/trunk@13141 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/Console/Console.vcxproj | 28 ++++ plugins/Console/Console.vcxproj.filters | 4 + plugins/Console/Console_10.vcxproj | 202 ---------------------------- plugins/Console/Console_10.vcxproj.filters | 47 ------- plugins/Console/Console_12.vcxproj | 205 ----------------------------- plugins/Console/Console_12.vcxproj.filters | 47 ------- plugins/Console/src/Console.cpp | 22 ++-- plugins/Console/src/commonheaders.h | 53 -------- plugins/Console/src/init.cpp | 6 +- plugins/Console/src/stdafx.cpp | 18 --- plugins/Console/src/stdafx.cxx | 18 +++ plugins/Console/src/stdafx.h | 51 +++++++ 12 files changed, 115 insertions(+), 586 deletions(-) create mode 100644 plugins/Console/Console.vcxproj create mode 100644 plugins/Console/Console.vcxproj.filters delete mode 100644 plugins/Console/Console_10.vcxproj delete mode 100644 plugins/Console/Console_10.vcxproj.filters delete mode 100644 plugins/Console/Console_12.vcxproj delete mode 100644 plugins/Console/Console_12.vcxproj.filters delete mode 100644 plugins/Console/src/commonheaders.h delete mode 100644 plugins/Console/src/stdafx.cpp create mode 100644 plugins/Console/src/stdafx.cxx create mode 100644 plugins/Console/src/stdafx.h (limited to 'plugins/Console') diff --git a/plugins/Console/Console.vcxproj b/plugins/Console/Console.vcxproj new file mode 100644 index 0000000000..a6d1e02863 --- /dev/null +++ b/plugins/Console/Console.vcxproj @@ -0,0 +1,28 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + Console + {A231E008-2D1A-4F24-95DD-59F56F85A499} + + + + + \ No newline at end of file diff --git a/plugins/Console/Console.vcxproj.filters b/plugins/Console/Console.vcxproj.filters new file mode 100644 index 0000000000..de5ad9f66c --- /dev/null +++ b/plugins/Console/Console.vcxproj.filters @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/plugins/Console/Console_10.vcxproj b/plugins/Console/Console_10.vcxproj deleted file mode 100644 index fad7e8db9a..0000000000 --- a/plugins/Console/Console_10.vcxproj +++ /dev/null @@ -1,202 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {A231E008-2D1A-4F24-95DD-59F56F85A499} - Console - - - - DynamicLibrary - Unicode - true - - - DynamicLibrary - Unicode - true - - - DynamicLibrary - Unicode - - - DynamicLibrary - Unicode - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)$(Configuration)\Plugins\ - $(SolutionDir)$(Configuration)\Obj\$(ProjectName)\ - $(SolutionDir)$(Configuration)\Plugins\ - $(SolutionDir)$(Configuration)\Obj\$(ProjectName)\ - $(SolutionDir)$(Configuration)64\Plugins\ - $(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\ - $(SolutionDir)$(Configuration)64\Plugins\ - $(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\ - true - - - - Disabled - ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) - _DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL - Use - Commonheaders.h - Level3 - EditAndContinue - false - - - _DEBUG;%(PreprocessorDefinitions) - ..\..\include\msapi - - - true - false - $(IntDir)$(TargetName).lib - Windows - $(ProfileDir)..\..\bin10\lib - Comctl32.lib;%(AdditionalDependencies) - - - - - Disabled - ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) - _DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL - Use - Commonheaders.h - Level3 - false - - - _DEBUG;%(PreprocessorDefinitions) - ..\..\include\msapi - - - true - false - $(IntDir)$(TargetName).lib - Windows - $(ProfileDir)..\..\bin10\lib - Comctl32.lib;%(AdditionalDependencies) - - - - - Full - AnySuitable - ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) - NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - true - true - Use - Commonheaders.h - Level3 - Size - false - - - NDEBUG;%(PreprocessorDefinitions) - ..\..\include\msapi - - - false - true - true - $(IntDir)$(TargetName).lib - true - Windows - $(ProfileDir)..\..\bin10\lib - /PDBALTPATH:%_PDB% - Comctl32.lib;%(AdditionalDependencies) - - - - - Full - AnySuitable - ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) - NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - true - true - Use - Commonheaders.h - Level3 - Size - false - - - NDEBUG;%(PreprocessorDefinitions) - ..\..\include\msapi - - - false - $(IntDir)$(TargetName).lib - true - true - true - Windows - $(ProfileDir)..\..\bin10\lib - /PDBALTPATH:%_PDB% - Comctl32.lib;%(AdditionalDependencies) - - - - - Create - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/plugins/Console/Console_10.vcxproj.filters b/plugins/Console/Console_10.vcxproj.filters deleted file mode 100644 index 8139c98e03..0000000000 --- a/plugins/Console/Console_10.vcxproj.filters +++ /dev/null @@ -1,47 +0,0 @@ - - - - - {94e1a2e5-64bb-4574-a01b-61fbe40e73e2} - cpp;c;cxx;rc;def;r;odl;idl;hpj;bat - - - {a5d1caa4-5b85-489a-bedc-9709b86d7dc0} - h;hpp;hxx;hm;inl - - - {1e71008e-a4e4-44c1-a0a9-d5fd17cd53f2} - ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe - - - - - Source Files - - - Source Files - - - Source Files - - - - - Header Files - - - Header Files - - - Header Files - - - - - Resource Files - - - Resource Files - - - \ No newline at end of file diff --git a/plugins/Console/Console_12.vcxproj b/plugins/Console/Console_12.vcxproj deleted file mode 100644 index 5bc5140db1..0000000000 --- a/plugins/Console/Console_12.vcxproj +++ /dev/null @@ -1,205 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {A231E008-2D1A-4F24-95DD-59F56F85A499} - Console - - - - DynamicLibrary - Unicode - true - v120_xp - - - DynamicLibrary - Unicode - true - v120_xp - - - DynamicLibrary - Unicode - v120_xp - - - DynamicLibrary - Unicode - v120_xp - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)$(Configuration)\Plugins\ - $(SolutionDir)$(Configuration)\Obj\$(ProjectName)\ - $(SolutionDir)$(Configuration)\Plugins\ - $(SolutionDir)$(Configuration)\Obj\$(ProjectName)\ - $(SolutionDir)$(Configuration)64\Plugins\ - $(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\ - $(SolutionDir)$(Configuration)64\Plugins\ - $(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\ - true - - - - Disabled - ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) - _DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL - Use - Commonheaders.h - Level3 - EditAndContinue - false - - - _DEBUG;%(PreprocessorDefinitions) - ..\..\include\msapi - - - true - false - $(IntDir)$(TargetName).lib - Windows - $(ProfileDir)..\..\bin12\lib - Comctl32.lib;%(AdditionalDependencies) - false - - - - - Disabled - ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) - _DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL - Use - Commonheaders.h - Level3 - false - - - _DEBUG;%(PreprocessorDefinitions) - ..\..\include\msapi - - - true - false - $(IntDir)$(TargetName).lib - Windows - $(ProfileDir)..\..\bin12\lib - Comctl32.lib;%(AdditionalDependencies) - - - - - Full - AnySuitable - ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) - NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - true - true - Use - Commonheaders.h - Level3 - Size - false - - - NDEBUG;%(PreprocessorDefinitions) - ..\..\include\msapi - - - false - true - true - $(IntDir)$(TargetName).lib - true - Windows - $(ProfileDir)..\..\bin12\lib - Comctl32.lib;%(AdditionalDependencies) - - - - - Full - AnySuitable - ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) - NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - true - true - Use - Commonheaders.h - Level3 - Size - false - - - NDEBUG;%(PreprocessorDefinitions) - ..\..\include\msapi - - - false - $(IntDir)$(TargetName).lib - true - true - true - Windows - $(ProfileDir)..\..\bin12\lib - Comctl32.lib;%(AdditionalDependencies) - - - - - Create - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/plugins/Console/Console_12.vcxproj.filters b/plugins/Console/Console_12.vcxproj.filters deleted file mode 100644 index 8139c98e03..0000000000 --- a/plugins/Console/Console_12.vcxproj.filters +++ /dev/null @@ -1,47 +0,0 @@ - - - - - {94e1a2e5-64bb-4574-a01b-61fbe40e73e2} - cpp;c;cxx;rc;def;r;odl;idl;hpj;bat - - - {a5d1caa4-5b85-489a-bedc-9709b86d7dc0} - h;hpp;hxx;hm;inl - - - {1e71008e-a4e4-44c1-a0a9-d5fd17cd53f2} - ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe - - - - - Source Files - - - Source Files - - - Source Files - - - - - Header Files - - - Header Files - - - Header Files - - - - - Resource Files - - - Resource Files - - - \ No newline at end of file diff --git a/plugins/Console/src/Console.cpp b/plugins/Console/src/Console.cpp index b6954c0387..80c7823d1f 100644 --- a/plugins/Console/src/Console.cpp +++ b/plugins/Console/src/Console.cpp @@ -22,7 +22,7 @@ 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" +#include "stdafx.h" #define MS_CONSOLE_SHOW_HIDE "Console/Show/Hide" @@ -117,7 +117,7 @@ static int Openfile(TCHAR *outputFile, int selection); static HANDLE hTTBButt = 0; -static int OnTTBLoaded(WPARAM wParam, LPARAM lParam) +static int OnTTBLoaded(WPARAM, LPARAM) { int state = IsWindowVisible(hwndConsole); @@ -177,7 +177,7 @@ static void ShowConsole(int show) //////////////////////////////////////////////////////////////////////////////// -static INT_PTR ShowHideConsole(WPARAM wParam, LPARAM lParam) +static INT_PTR ShowHideConsole(WPARAM, LPARAM) { if (hwndConsole) ShowConsole(!IsWindowVisible(hwndConsole)); @@ -187,7 +187,7 @@ static INT_PTR ShowHideConsole(WPARAM wParam, LPARAM lParam) //////////////////////////////////////////////////////////////////////////////// -int LogResize(HWND hwnd, LPARAM lParam, UTILRESIZECONTROL *urc) +int LogResize(HWND hwnd, LPARAM, UTILRESIZECONTROL *urc) { switch (urc->wId) { case IDC_LIST: @@ -603,7 +603,7 @@ static INT_PTR CALLBACK LogDlgProc(HWND hwndDlg, UINT message, WPARAM wParam, LP //////////////////////////////////////////////////////////////////////////////// -int ConsoleResize(HWND hwnd, LPARAM lParam, UTILRESIZECONTROL *urc) +int ConsoleResize(HWND, LPARAM, UTILRESIZECONTROL *urc) { switch (urc->wId) { case IDC_TABS: @@ -916,7 +916,7 @@ static INT_PTR CALLBACK ConsoleDlgProc(HWND hwndDlg, UINT message, WPARAM wParam //////////////////////////////////////////////////////////////////////////////// -void __cdecl ConsoleThread(void *arg) +void __cdecl ConsoleThread(void*) { MSG msg; HWND hwnd; @@ -1075,7 +1075,7 @@ static INT_PTR CALLBACK OptDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM } -static int OptInit(WPARAM wParam, LPARAM lParam) +static int OptInit(WPARAM wParam, LPARAM) { OPTIONSDIALOGPAGE odp = { 0 }; odp.hInstance = hInst; @@ -1090,7 +1090,7 @@ static int OptInit(WPARAM wParam, LPARAM lParam) /////////////////////////////////////////////////////////////////////////////// -static int OnColourChange(WPARAM wParam, LPARAM lParam) +static int OnColourChange(WPARAM, LPARAM) { if (hwndConsole) { ColourID cid = { 0 }; @@ -1109,7 +1109,7 @@ static int OnColourChange(WPARAM wParam, LPARAM lParam) } -static int OnFontChange(WPARAM wParam, LPARAM lParam) +static int OnFontChange(WPARAM, LPARAM) { if (hwndConsole) { HFONT hf = NULL; @@ -1135,7 +1135,7 @@ static int OnFontChange(WPARAM wParam, LPARAM lParam) return 0; } -static int OnSystemModulesLoaded(WPARAM wParam, LPARAM lParam) +static int OnSystemModulesLoaded(WPARAM, LPARAM) { CreateServiceFunction(MS_CONSOLE_SHOW_HIDE, ShowHideConsole); @@ -1200,7 +1200,7 @@ static int OnSystemModulesLoaded(WPARAM wParam, LPARAM lParam) return 0; } -static int PreshutdownConsole(WPARAM wParam, LPARAM lParam) +static int PreshutdownConsole(WPARAM, LPARAM) { if (hwndConsole) PostMessage(hwndConsole, WM_CLOSE, 0, 1 ); diff --git a/plugins/Console/src/commonheaders.h b/plugins/Console/src/commonheaders.h deleted file mode 100644 index 8b623050a8..0000000000 --- a/plugins/Console/src/commonheaders.h +++ /dev/null @@ -1,53 +0,0 @@ -/* - -Miranda NG: the free IM client for Microsoft* Windows* - -Copyright (ñ) 2012-15 Miranda NG project (http://miranda-ng.org), -Copyright (c) 2000-08 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. -*/ - -#define _CRT_SECURE_NO_WARNINGS - -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include - -#include "resource.h" -#include "version.h" - -extern HINSTANCE hInst; - -void InitConsole(); -void ShutdownConsole(); -HANDLE LoadIcon(int iIconID); - -#define MS_NETLIB_LOGWIN "Netlib/Log/Win" diff --git a/plugins/Console/src/init.cpp b/plugins/Console/src/init.cpp index bf9546f40b..019dfe453d 100644 --- a/plugins/Console/src/init.cpp +++ b/plugins/Console/src/init.cpp @@ -22,7 +22,7 @@ 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" +#include "stdafx.h" DWORD mirandaVer; int hLangpack; @@ -42,13 +42,13 @@ PLUGININFOEX pluginInfoEx={ {0x23d4f302, 0xd513, 0x45b7, {0x90, 0x27, 0x44, 0x5f, 0x29, 0x55, 0x73, 0x11}} }; -BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD, LPVOID) { hInst = hinstDLL; return TRUE; } -extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD mirandaVersion) +extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD) { return &pluginInfoEx; } diff --git a/plugins/Console/src/stdafx.cpp b/plugins/Console/src/stdafx.cpp deleted file mode 100644 index 61fee5df67..0000000000 --- a/plugins/Console/src/stdafx.cpp +++ /dev/null @@ -1,18 +0,0 @@ -/* -Copyright (C) 2012-15 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 "Commonheaders.h" \ No newline at end of file diff --git a/plugins/Console/src/stdafx.cxx b/plugins/Console/src/stdafx.cxx new file mode 100644 index 0000000000..6fb37564b7 --- /dev/null +++ b/plugins/Console/src/stdafx.cxx @@ -0,0 +1,18 @@ +/* +Copyright (C) 2012-15 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 "stdafx.h" \ No newline at end of file diff --git a/plugins/Console/src/stdafx.h b/plugins/Console/src/stdafx.h new file mode 100644 index 0000000000..c7656b5864 --- /dev/null +++ b/plugins/Console/src/stdafx.h @@ -0,0 +1,51 @@ +/* + +Miranda NG: the free IM client for Microsoft* Windows* + +Copyright (ñ) 2012-15 Miranda NG project (http://miranda-ng.org), +Copyright (c) 2000-08 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. +*/ + +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include + +#include "resource.h" +#include "version.h" + +extern HINSTANCE hInst; + +void InitConsole(); +void ShutdownConsole(); +HANDLE LoadIcon(int iIconID); + +#define MS_NETLIB_LOGWIN "Netlib/Log/Win" -- cgit v1.2.3