From 1ed8a4ff1ec95b0df08a5bf48bb372c8481e381b Mon Sep 17 00:00:00 2001 From: George Hazan Date: Mon, 2 Jul 2012 15:12:10 +0000 Subject: compilation fix git-svn-id: http://svn.miranda-ng.org/main/trunk@716 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/CryptoPP/cpp_gpgw.cpp | 6 +- plugins/CryptoPP/crypto/cryptlib_10.vcxproj | 333 ---------------------------- plugins/CryptoPP/cryptopp_10.vcxproj | 2 +- 3 files changed, 4 insertions(+), 337 deletions(-) (limited to 'plugins/CryptoPP') diff --git a/plugins/CryptoPP/cpp_gpgw.cpp b/plugins/CryptoPP/cpp_gpgw.cpp index 90fe8b3062..223280590f 100644 --- a/plugins/CryptoPP/cpp_gpgw.cpp +++ b/plugins/CryptoPP/cpp_gpgw.cpp @@ -203,7 +203,7 @@ LPSTR __cdecl gpg_encrypt(pCNTX ptr, LPCSTR szPlainMsg) szEncMsg = p_gpg_encrypt(szPlainMsg,(LPCSTR)p->gpgKeyID); if (!szEncMsg) return 0; - ptr->tmp = (LPSTR) strdup(szEncMsg); + ptr->tmp = (LPSTR)_strdup(szEncMsg); LocalFree((LPVOID)szEncMsg); return ptr->tmp; @@ -223,7 +223,7 @@ LPSTR __cdecl gpg_decrypt(pCNTX ptr, LPCSTR szEncMsg) if (!szPlainMsg) return NULL; }*/ - ptr->tmp = (LPSTR) strdup(szPlainMsg); + ptr->tmp = (LPSTR)_strdup(szPlainMsg); LocalFree((LPVOID)szPlainMsg); return ptr->tmp; @@ -301,7 +301,7 @@ int __cdecl gpg_set_keyid(HANDLE context, LPCSTR RemoteKeyID) ptr->error = ERROR_NONE; SAFE_FREE(p->gpgKeyID); - p->gpgKeyID = (PBYTE) strdup(RemoteKeyID); + p->gpgKeyID = (PBYTE)_strdup(RemoteKeyID); return 1; } diff --git a/plugins/CryptoPP/crypto/cryptlib_10.vcxproj b/plugins/CryptoPP/crypto/cryptlib_10.vcxproj index 864b10a723..f61be4af71 100644 --- a/plugins/CryptoPP/crypto/cryptlib_10.vcxproj +++ b/plugins/CryptoPP/crypto/cryptlib_10.vcxproj @@ -5,14 +5,6 @@ Debug Win32 - - DLL-Import Debug - Win32 - - - DLL-Import Release - Win32 - Release Win32 @@ -23,18 +15,10 @@ {290C5ED4-71A7-4040-AD26-4820CF7A9E60} - - StaticLibrary - false - StaticLibrary false - - StaticLibrary - false - StaticLibrary false @@ -43,18 +27,10 @@ - - - - - - - - @@ -64,12 +40,8 @@ <_ProjectFileVersion>10.0.40219.1 $(SolutionDir)$(Configuration)\Obj\$(ProjectName)\ $(SolutionDir)$(Configuration)\Obj\$(ProjectName)\ - $(SolutionDir)$(Configuration)\Obj\$(ProjectName)\ - $(SolutionDir)$(Configuration)\Obj\$(ProjectName)\ $(SolutionDir)$(Configuration)\Obj\$(ProjectName)\ $(SolutionDir)$(Configuration)\Obj\$(ProjectName)\ - $(SolutionDir)$(Configuration)\Obj\$(ProjectName)\ - $(SolutionDir)$(Configuration)\Obj\$(ProjectName)\ @@ -97,38 +69,6 @@ true - - - /Zm400 %(AdditionalOptions) - MaxSpeed - AnySuitable - NDEBUG;_WINDOWS;USE_PRECOMPILED_HEADERS;WIN32;CRYPTOPP_IMPORTS;%(PreprocessorDefinitions) - true - MultiThreaded - true - Use - pch.h - .\DLL_Import_Release/cryptlib.pch - .\DLL_Import_Release/ - .\DLL_Import_Release/ - .\DLL_Import_Release/ - Level3 - true - ProgramDatabase - StdCall - - - 0x0409 - - - .\DLL_Import_Release\cryptlib.lib - true - - - true - .\DLL_Import_Release/cryptlib.bsc - - /Zm400 %(AdditionalOptions) @@ -151,193 +91,108 @@ true - - - /Zm400 %(AdditionalOptions) - true - _DEBUG;_WINDOWS;USE_PRECOMPILED_HEADERS;WIN32;CRYPTOPP_IMPORTS;%(PreprocessorDefinitions) - MultiThreadedDebug - Use - pch.h - .\DLL_Import_Debug/cryptlib.pch - .\DLL_Import_Debug/ - .\DLL_Import_Debug/ - .\DLL_Import_Debug/ - Level3 - true - ProgramDatabase - StdCall - - - 0x0409 - - - .\DLL_Import_Debug\cryptlib.lib - true - - - true - .\DLL_Import_Debug/cryptlib.bsc - - - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) %(PreprocessorDefinitions) %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) %(PreprocessorDefinitions) %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) %(PreprocessorDefinitions) %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) %(PreprocessorDefinitions) %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) %(PreprocessorDefinitions) %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) %(PreprocessorDefinitions) %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) %(PreprocessorDefinitions) %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) %(PreprocessorDefinitions) %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) %(PreprocessorDefinitions) %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) %(PreprocessorDefinitions) %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) %(PreprocessorDefinitions) %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) %(PreprocessorDefinitions) %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) %(PreprocessorDefinitions) %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) %(PreprocessorDefinitions) %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) %(PreprocessorDefinitions) %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) %(PreprocessorDefinitions) %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) %(PreprocessorDefinitions) %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) %(PreprocessorDefinitions) %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) %(PreprocessorDefinitions) %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) %(PreprocessorDefinitions) %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) %(PreprocessorDefinitions) %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) %(PreprocessorDefinitions) %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) %(PreprocessorDefinitions) %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) %(PreprocessorDefinitions) %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) %(PreprocessorDefinitions) %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - %(PreprocessorDefinitions) - - %(PreprocessorDefinitions) @@ -346,554 +201,366 @@ - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) %(PreprocessorDefinitions) %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) %(PreprocessorDefinitions) %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) %(PreprocessorDefinitions) %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) %(PreprocessorDefinitions) %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) %(PreprocessorDefinitions) %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) %(PreprocessorDefinitions) %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) %(PreprocessorDefinitions) %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) %(PreprocessorDefinitions) %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) %(PreprocessorDefinitions) %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) %(PreprocessorDefinitions) %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) %(PreprocessorDefinitions) %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) %(PreprocessorDefinitions) %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) %(PreprocessorDefinitions) %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) %(PreprocessorDefinitions) %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) %(PreprocessorDefinitions) %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) %(PreprocessorDefinitions) %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) %(PreprocessorDefinitions) %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) %(PreprocessorDefinitions) %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) %(PreprocessorDefinitions) %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) %(PreprocessorDefinitions) %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) %(PreprocessorDefinitions) %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) %(PreprocessorDefinitions) %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) %(PreprocessorDefinitions) %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) %(PreprocessorDefinitions) %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) %(PreprocessorDefinitions) %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) %(PreprocessorDefinitions) %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) %(PreprocessorDefinitions) %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) %(PreprocessorDefinitions) %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) %(PreprocessorDefinitions) %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) %(PreprocessorDefinitions) %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) %(PreprocessorDefinitions) %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) %(PreprocessorDefinitions) %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) %(PreprocessorDefinitions) %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) %(PreprocessorDefinitions) %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) %(PreprocessorDefinitions) %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) %(PreprocessorDefinitions) %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) %(PreprocessorDefinitions) %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) %(PreprocessorDefinitions) %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) %(PreprocessorDefinitions) %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) %(PreprocessorDefinitions) %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - Create - %(PreprocessorDefinitions) - Create %(PreprocessorDefinitions) Create %(PreprocessorDefinitions) Create - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) %(PreprocessorDefinitions) %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) %(PreprocessorDefinitions) %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) %(PreprocessorDefinitions) %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) %(PreprocessorDefinitions) %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) %(PreprocessorDefinitions) %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) %(PreprocessorDefinitions) %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) %(PreprocessorDefinitions) %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) %(PreprocessorDefinitions) %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) %(PreprocessorDefinitions) %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) %(PreprocessorDefinitions) %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) %(PreprocessorDefinitions) %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) %(PreprocessorDefinitions) %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) %(PreprocessorDefinitions) %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) %(PreprocessorDefinitions) %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) %(PreprocessorDefinitions) %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) %(PreprocessorDefinitions) %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) %(PreprocessorDefinitions) %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) %(PreprocessorDefinitions) %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) %(PreprocessorDefinitions) %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) %(PreprocessorDefinitions) %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) %(PreprocessorDefinitions) %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) %(PreprocessorDefinitions) %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) %(PreprocessorDefinitions) %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) %(PreprocessorDefinitions) %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) %(PreprocessorDefinitions) %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) %(PreprocessorDefinitions) %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) %(PreprocessorDefinitions) %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) %(PreprocessorDefinitions) %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) %(PreprocessorDefinitions) %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) %(PreprocessorDefinitions) %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) %(PreprocessorDefinitions) %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) %(PreprocessorDefinitions) %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) %(PreprocessorDefinitions) %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) %(PreprocessorDefinitions) %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) %(PreprocessorDefinitions) %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) %(PreprocessorDefinitions) %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) %(PreprocessorDefinitions) %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) %(PreprocessorDefinitions) %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) %(PreprocessorDefinitions) %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) %(PreprocessorDefinitions) %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) %(PreprocessorDefinitions) %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) %(PreprocessorDefinitions) %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) %(PreprocessorDefinitions) %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) %(PreprocessorDefinitions) %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) %(PreprocessorDefinitions) %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) %(PreprocessorDefinitions) %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) %(PreprocessorDefinitions) %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) %(PreprocessorDefinitions) %(PreprocessorDefinitions) - if not exist adhoc.cpp copy "%(FullPath)" adhoc.cpp -echo: >> adhoc.cpp.copied - - adhoc.cpp.copied;%(Outputs) - if not exist adhoc.cpp copy "%(FullPath)" adhoc.cpp -echo: >> adhoc.cpp.copied - - adhoc.cpp.copied;%(Outputs) if not exist adhoc.cpp copy "%(FullPath)" adhoc.cpp echo: >> adhoc.cpp.copied diff --git a/plugins/CryptoPP/cryptopp_10.vcxproj b/plugins/CryptoPP/cryptopp_10.vcxproj index 8deb7b4c40..8d81572189 100644 --- a/plugins/CryptoPP/cryptopp_10.vcxproj +++ b/plugins/CryptoPP/cryptopp_10.vcxproj @@ -98,7 +98,7 @@ MinSpace Size ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;CRYPTOPP_IMPORTS;%(PreprocessorDefinitions) + WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) true MultiThreadedDLL true -- cgit v1.2.3