From 3a6ae858f40d5e91d5c7929658470f811e45b0a0 Mon Sep 17 00:00:00 2001 From: Kirill Volinsky Date: Sat, 8 Aug 2015 20:24:10 +0000 Subject: stdssl: common project git-svn-id: http://svn.miranda-ng.org/main/trunk@14870 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- src/core/stdssl/src/commonheaders.h | 71 ---------- src/core/stdssl/src/main.cpp | 2 +- src/core/stdssl/src/netlibssl.cpp | 2 +- src/core/stdssl/src/stdafx.cpp | 19 --- src/core/stdssl/src/stdafx.cxx | 19 +++ src/core/stdssl/src/stdafx.h | 71 ++++++++++ src/core/stdssl/stdssl.vcxproj | 28 ++++ src/core/stdssl/stdssl.vcxproj.filters | 4 + src/core/stdssl/stdssl_10.vcxproj | 209 ----------------------------- src/core/stdssl/stdssl_10.vcxproj.filters | 38 ------ src/core/stdssl/stdssl_12.vcxproj | 212 ------------------------------ src/core/stdssl/stdssl_12.vcxproj.filters | 38 ------ src/core/stdssl/stdssl_14.vcxproj | 212 ------------------------------ src/core/stdssl/stdssl_14.vcxproj.filters | 38 ------ 14 files changed, 124 insertions(+), 839 deletions(-) delete mode 100644 src/core/stdssl/src/commonheaders.h delete mode 100644 src/core/stdssl/src/stdafx.cpp create mode 100644 src/core/stdssl/src/stdafx.cxx create mode 100644 src/core/stdssl/src/stdafx.h create mode 100644 src/core/stdssl/stdssl.vcxproj create mode 100644 src/core/stdssl/stdssl.vcxproj.filters delete mode 100644 src/core/stdssl/stdssl_10.vcxproj delete mode 100644 src/core/stdssl/stdssl_10.vcxproj.filters delete mode 100644 src/core/stdssl/stdssl_12.vcxproj delete mode 100644 src/core/stdssl/stdssl_12.vcxproj.filters delete mode 100644 src/core/stdssl/stdssl_14.vcxproj delete mode 100644 src/core/stdssl/stdssl_14.vcxproj.filters (limited to 'src/core/stdssl') diff --git a/src/core/stdssl/src/commonheaders.h b/src/core/stdssl/src/commonheaders.h deleted file mode 100644 index fcfad31b67..0000000000 --- a/src/core/stdssl/src/commonheaders.h +++ /dev/null @@ -1,71 +0,0 @@ -/* - -Copyright 2000-12 Miranda IM, 2012-15 Miranda NG 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 - -#define SECURITY_WIN32 -#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" - -extern HINSTANCE g_hInst; diff --git a/src/core/stdssl/src/main.cpp b/src/core/stdssl/src/main.cpp index 6fd8eceb51..51536dce9e 100644 --- a/src/core/stdssl/src/main.cpp +++ b/src/core/stdssl/src/main.cpp @@ -19,7 +19,7 @@ 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" +#include "stdafx.h" int LoadSslModule(void); void UnloadSslModule(void); diff --git a/src/core/stdssl/src/netlibssl.cpp b/src/core/stdssl/src/netlibssl.cpp index 1a4cdafa31..abcc58ff16 100644 --- a/src/core/stdssl/src/netlibssl.cpp +++ b/src/core/stdssl/src/netlibssl.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" #pragma comment(lib, "secur32.lib") #pragma comment(lib, "crypt32.lib") diff --git a/src/core/stdssl/src/stdafx.cpp b/src/core/stdssl/src/stdafx.cpp deleted file mode 100644 index 288f19664b..0000000000 --- a/src/core/stdssl/src/stdafx.cpp +++ /dev/null @@ -1,19 +0,0 @@ -/* - -Copyright (C) 2012-15 Miranda NG team (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/src/core/stdssl/src/stdafx.cxx b/src/core/stdssl/src/stdafx.cxx new file mode 100644 index 0000000000..5d3cae4e8e --- /dev/null +++ b/src/core/stdssl/src/stdafx.cxx @@ -0,0 +1,19 @@ +/* + +Copyright (C) 2012-15 Miranda NG team (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/src/core/stdssl/src/stdafx.h b/src/core/stdssl/src/stdafx.h new file mode 100644 index 0000000000..fcfad31b67 --- /dev/null +++ b/src/core/stdssl/src/stdafx.h @@ -0,0 +1,71 @@ +/* + +Copyright 2000-12 Miranda IM, 2012-15 Miranda NG 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 + +#define SECURITY_WIN32 +#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" + +extern HINSTANCE g_hInst; diff --git a/src/core/stdssl/stdssl.vcxproj b/src/core/stdssl/stdssl.vcxproj new file mode 100644 index 0000000000..48eeac6f40 --- /dev/null +++ b/src/core/stdssl/stdssl.vcxproj @@ -0,0 +1,28 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + StdSSL + {2C9F6CB6-3E70-4E7A-945D-2A7C148B0DF3} + + + + + \ No newline at end of file diff --git a/src/core/stdssl/stdssl.vcxproj.filters b/src/core/stdssl/stdssl.vcxproj.filters new file mode 100644 index 0000000000..e39f86d5d6 --- /dev/null +++ b/src/core/stdssl/stdssl.vcxproj.filters @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/src/core/stdssl/stdssl_10.vcxproj b/src/core/stdssl/stdssl_10.vcxproj deleted file mode 100644 index 8acabd946c..0000000000 --- a/src/core/stdssl/stdssl_10.vcxproj +++ /dev/null @@ -1,209 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - StdSSL - {2C9F6CB6-3E70-4E7A-945D-2A7C148B0DF3} - - - - DynamicLibrary - Unicode - - - DynamicLibrary - true - Unicode - - - DynamicLibrary - Unicode - - - DynamicLibrary - Unicode - true - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30128.1 - $(SolutionDir)$(Configuration)\Core\ - $(SolutionDir)$(Configuration)\Obj\$(ProjectName)\ - $(SolutionDir)$(Configuration)64\Core\ - $(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\ - $(SolutionDir)$(Configuration)\Core\ - $(SolutionDir)$(Configuration)\Obj\$(ProjectName)\ - $(SolutionDir)$(Configuration)64\Core\ - $(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\ - true - - - - Full - OnlyExplicitInline - Size - ..\..\..\include;%(AdditionalIncludeDirectories) - NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - true - false - true - Fast - Use - Level3 - commonheaders.h - false - - - NDEBUG;%(PreprocessorDefinitions) - ..\..\..\include;..\..\..\include\msapi - - - comctl32.lib;UxTheme.lib;%(AdditionalDependencies) - true - true - true - false - $(IntDir)$(TargetName).lib - Windows - $(ProfileDir)..\..\..\bin10\lib - /PDBALTPATH:%_PDB% - - - - - Full - OnlyExplicitInline - Size - ..\..\..\include;%(AdditionalIncludeDirectories) - NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - true - false - true - Fast - Use - Level3 - commonheaders.h - false - - - NDEBUG;%(PreprocessorDefinitions) - ..\..\..\include;..\..\..\include\msapi - - - comctl32.lib;UxTheme.lib;%(AdditionalDependencies) - true - true - true - false - $(IntDir)$(TargetName).lib - Windows - $(ProfileDir)..\..\..\bin10\lib - /PDBALTPATH:%_PDB% - - - - - Disabled - ..\..\..\include;%(AdditionalIncludeDirectories) - _DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - false - EnableFastChecks - MultiThreadedDebugDLL - true - Fast - Use - Level3 - EditAndContinue - commonheaders.h - false - - - _DEBUG;%(PreprocessorDefinitions) - ..\..\..\include;..\..\..\include\msapi - - - true - false - $(IntDir)$(TargetName).lib - Windows - comctl32.lib;UxTheme.lib;%(AdditionalDependencies) - $(ProfileDir)..\..\..\bin10\lib - - - - - Disabled - ..\..\..\include;%(AdditionalIncludeDirectories) - _DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - false - EnableFastChecks - MultiThreadedDebugDLL - true - Fast - Use - Level3 - commonheaders.h - false - - - _DEBUG;%(PreprocessorDefinitions) - ..\..\..\include;..\..\..\include\msapi - - - comctl32.lib;UxTheme.lib;%(AdditionalDependencies) - true - false - $(IntDir)$(TargetName).lib - Windows - $(ProfileDir)..\..\..\bin10\lib - - - - - - - Create - - - - - - - - - - - - \ No newline at end of file diff --git a/src/core/stdssl/stdssl_10.vcxproj.filters b/src/core/stdssl/stdssl_10.vcxproj.filters deleted file mode 100644 index 7b0f962216..0000000000 --- a/src/core/stdssl/stdssl_10.vcxproj.filters +++ /dev/null @@ -1,38 +0,0 @@ - - - - - {8927e967-671b-4c16-8208-54dec5f31489} - cpp;c;cxx;rc;def;r;odl;idl;hpj;bat - - - {6ae44719-2dc0-4659-bb57-b80bc11f0eb2} - h;hpp;hxx;hm;inl - - - {ed6d6a77-6f3c-4512-afc9-7c872bee5ded} - ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe - - - - - Source Files - - - Source Files - - - Source Files - - - - - Header Files - - - - - Resource Files - - - \ No newline at end of file diff --git a/src/core/stdssl/stdssl_12.vcxproj b/src/core/stdssl/stdssl_12.vcxproj deleted file mode 100644 index 650098302d..0000000000 --- a/src/core/stdssl/stdssl_12.vcxproj +++ /dev/null @@ -1,212 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - StdSSL - {2C9F6CB6-3E70-4E7A-945D-2A7C148B0DF3} - - - - DynamicLibrary - Unicode - v120_xp - - - DynamicLibrary - true - Unicode - v120_xp - - - DynamicLibrary - Unicode - v120_xp - - - DynamicLibrary - Unicode - true - v120_xp - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30128.1 - $(SolutionDir)$(Configuration)\Core\ - $(SolutionDir)$(Configuration)\Obj\$(ProjectName)\ - $(SolutionDir)$(Configuration)64\Core\ - $(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\ - $(SolutionDir)$(Configuration)\Core\ - $(SolutionDir)$(Configuration)\Obj\$(ProjectName)\ - $(SolutionDir)$(Configuration)64\Core\ - $(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\ - true - - - - Full - OnlyExplicitInline - Size - ..\..\..\include;%(AdditionalIncludeDirectories) - NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - true - false - true - Fast - Use - Level3 - commonheaders.h - false - - - NDEBUG;%(PreprocessorDefinitions) - ..\..\..\include;..\..\..\include\msapi - - - comctl32.lib;UxTheme.lib;%(AdditionalDependencies) - true - true - true - false - $(IntDir)$(TargetName).lib - Windows - $(ProfileDir)..\..\..\bin12\lib - - - - - Full - OnlyExplicitInline - Size - ..\..\..\include;%(AdditionalIncludeDirectories) - NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - true - false - true - Fast - Use - Level3 - commonheaders.h - false - - - NDEBUG;%(PreprocessorDefinitions) - ..\..\..\include;..\..\..\include\msapi - - - comctl32.lib;UxTheme.lib;%(AdditionalDependencies) - true - true - true - false - $(IntDir)$(TargetName).lib - Windows - $(ProfileDir)..\..\..\bin12\lib - - - - - Disabled - ..\..\..\include;%(AdditionalIncludeDirectories) - _DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - false - EnableFastChecks - MultiThreadedDebugDLL - true - Fast - Use - Level3 - EditAndContinue - commonheaders.h - false - - - _DEBUG;%(PreprocessorDefinitions) - ..\..\..\include;..\..\..\include\msapi - - - true - false - $(IntDir)$(TargetName).lib - Windows - comctl32.lib;UxTheme.lib;%(AdditionalDependencies) - $(ProfileDir)..\..\..\bin12\lib - false - - - - - Disabled - ..\..\..\include;%(AdditionalIncludeDirectories) - _DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - false - EnableFastChecks - MultiThreadedDebugDLL - true - Fast - Use - Level3 - commonheaders.h - false - - - _DEBUG;%(PreprocessorDefinitions) - ..\..\..\include;..\..\..\include\msapi - - - comctl32.lib;UxTheme.lib;%(AdditionalDependencies) - true - false - $(IntDir)$(TargetName).lib - Windows - $(ProfileDir)..\..\..\bin12\lib - - - - - - - Create - - - - - - - - - - - - \ No newline at end of file diff --git a/src/core/stdssl/stdssl_12.vcxproj.filters b/src/core/stdssl/stdssl_12.vcxproj.filters deleted file mode 100644 index 7b0f962216..0000000000 --- a/src/core/stdssl/stdssl_12.vcxproj.filters +++ /dev/null @@ -1,38 +0,0 @@ - - - - - {8927e967-671b-4c16-8208-54dec5f31489} - cpp;c;cxx;rc;def;r;odl;idl;hpj;bat - - - {6ae44719-2dc0-4659-bb57-b80bc11f0eb2} - h;hpp;hxx;hm;inl - - - {ed6d6a77-6f3c-4512-afc9-7c872bee5ded} - ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe - - - - - Source Files - - - Source Files - - - Source Files - - - - - Header Files - - - - - Resource Files - - - \ No newline at end of file diff --git a/src/core/stdssl/stdssl_14.vcxproj b/src/core/stdssl/stdssl_14.vcxproj deleted file mode 100644 index be08137c20..0000000000 --- a/src/core/stdssl/stdssl_14.vcxproj +++ /dev/null @@ -1,212 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - StdSSL - {2C9F6CB6-3E70-4E7A-945D-2A7C148B0DF3} - - - - DynamicLibrary - Unicode - v140_xp - - - DynamicLibrary - true - Unicode - v140_xp - - - DynamicLibrary - Unicode - v140_xp - - - DynamicLibrary - Unicode - true - v140_xp - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30128.1 - $(SolutionDir)$(Configuration)\Core\ - $(SolutionDir)$(Configuration)\Obj\$(ProjectName)\ - $(SolutionDir)$(Configuration)64\Core\ - $(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\ - $(SolutionDir)$(Configuration)\Core\ - $(SolutionDir)$(Configuration)\Obj\$(ProjectName)\ - $(SolutionDir)$(Configuration)64\Core\ - $(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\ - true - - - - Full - OnlyExplicitInline - Size - ..\..\..\include;%(AdditionalIncludeDirectories) - NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - true - false - true - Fast - Use - Level3 - commonheaders.h - false - - - NDEBUG;%(PreprocessorDefinitions) - ..\..\..\include;..\..\..\include\msapi - - - comctl32.lib;UxTheme.lib;%(AdditionalDependencies) - true - true - true - false - $(IntDir)$(TargetName).lib - Windows - $(ProfileDir)..\..\..\bin14\lib - - - - - Full - OnlyExplicitInline - Size - ..\..\..\include;%(AdditionalIncludeDirectories) - NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - true - false - true - Fast - Use - Level3 - commonheaders.h - false - - - NDEBUG;%(PreprocessorDefinitions) - ..\..\..\include;..\..\..\include\msapi - - - comctl32.lib;UxTheme.lib;%(AdditionalDependencies) - true - true - true - false - $(IntDir)$(TargetName).lib - Windows - $(ProfileDir)..\..\..\bin14\lib - - - - - Disabled - ..\..\..\include;%(AdditionalIncludeDirectories) - _DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - false - EnableFastChecks - MultiThreadedDebugDLL - true - Fast - Use - Level3 - EditAndContinue - commonheaders.h - false - - - _DEBUG;%(PreprocessorDefinitions) - ..\..\..\include;..\..\..\include\msapi - - - true - false - $(IntDir)$(TargetName).lib - Windows - comctl32.lib;UxTheme.lib;%(AdditionalDependencies) - $(ProfileDir)..\..\..\bin14\lib - false - - - - - Disabled - ..\..\..\include;%(AdditionalIncludeDirectories) - _DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - false - EnableFastChecks - MultiThreadedDebugDLL - true - Fast - Use - Level3 - commonheaders.h - false - - - _DEBUG;%(PreprocessorDefinitions) - ..\..\..\include;..\..\..\include\msapi - - - comctl32.lib;UxTheme.lib;%(AdditionalDependencies) - true - false - $(IntDir)$(TargetName).lib - Windows - $(ProfileDir)..\..\..\bin14\lib - - - - - - - Create - - - - - - - - - - - - \ No newline at end of file diff --git a/src/core/stdssl/stdssl_14.vcxproj.filters b/src/core/stdssl/stdssl_14.vcxproj.filters deleted file mode 100644 index 7b0f962216..0000000000 --- a/src/core/stdssl/stdssl_14.vcxproj.filters +++ /dev/null @@ -1,38 +0,0 @@ - - - - - {8927e967-671b-4c16-8208-54dec5f31489} - cpp;c;cxx;rc;def;r;odl;idl;hpj;bat - - - {6ae44719-2dc0-4659-bb57-b80bc11f0eb2} - h;hpp;hxx;hm;inl - - - {ed6d6a77-6f3c-4512-afc9-7c872bee5ded} - ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe - - - - - Source Files - - - Source Files - - - Source Files - - - - - Header Files - - - - - Resource Files - - - \ No newline at end of file -- cgit v1.2.3