diff options
| author | MikalaiR <nikolay.romanovich@narod.ru> | 2016-04-02 10:50:56 +0000 |
|---|---|---|
| committer | MikalaiR <nikolay.romanovich@narod.ru> | 2016-04-02 10:50:56 +0000 |
| commit | 2e871b6fbd4053022eca4184237cc2cde5fff8df (patch) | |
| tree | dbd9b4c1a4de863dc172cc641291906ea8b20a39 | |
| parent | c407ab64318098528867fd779039968d1ac95910 (diff) | |
StdSSL: code cleanup
git-svn-id: http://svn.miranda-ng.org/main/trunk@16574 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
| -rw-r--r-- | src/core/stdssl/src/netlibssl.cpp | 16 | ||||
| -rw-r--r-- | src/core/stdssl/src/stdafx.h | 38 | ||||
| -rw-r--r-- | src/core/stdssl/stdssl.vcxproj | 8 |
3 files changed, 18 insertions, 44 deletions
diff --git a/src/core/stdssl/src/netlibssl.cpp b/src/core/stdssl/src/netlibssl.cpp index c6b96501ab..eee3541d06 100644 --- a/src/core/stdssl/src/netlibssl.cpp +++ b/src/core/stdssl/src/netlibssl.cpp @@ -24,10 +24,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "stdafx.h"
-#pragma comment(lib, "secur32.lib")
-#pragma comment(lib, "crypt32.lib")
-#pragma comment(lib, "wsock32.lib")
-
typedef BOOL (*SSL_EMPTY_CACHE_FN_M)(VOID);
static HMODULE g_hSchannel;
@@ -764,12 +760,12 @@ static INT_PTR GetSslApi(WPARAM, LPARAM lParam) if (si->cbSize != sizeof(SSL_API))
return FALSE;
- si->connect = (HSSL(__cdecl *)(SOCKET, const char *, int))NetlibSslConnect;
- si->pending = (BOOL(__cdecl *)(HSSL))NetlibSslPending;
- si->read = (int(__cdecl *)(HSSL, char *, int, int))NetlibSslRead;
- si->write = (int(__cdecl *)(HSSL, const char *, int))NetlibSslWrite;
- si->shutdown = (void(__cdecl *)(HSSL))NetlibSslShutdown;
- si->sfree = (void(__cdecl *)(HSSL))NetlibSslFree;
+ si->connect = NetlibSslConnect;
+ si->pending = NetlibSslPending;
+ si->read = NetlibSslRead;
+ si->write = NetlibSslWrite;
+ si->shutdown = NetlibSslShutdown;
+ si->sfree = NetlibSslFree;
return TRUE;
}
diff --git a/src/core/stdssl/src/stdafx.h b/src/core/stdssl/src/stdafx.h index 45f135e8bc..55cd62ba73 100644 --- a/src/core/stdssl/src/stdafx.h +++ b/src/core/stdssl/src/stdafx.h @@ -18,49 +18,19 @@ 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 SECURITY_WIN32
+#define HSSL_DEFINED + +typedef struct SslHandle *HSSL;
#include <windows.h>
-#include <windowsx.h>
-#include <ole2.h>
-#include <shellapi.h>
-#include <shlobj.h>
-#include <commctrl.h>
-#include <vssym32.h>
-#include <Uxtheme.h>
-
-#define SECURITY_WIN32
#include <security.h>
#include <schannel.h>
#include <malloc.h>
-#include <time.h>
-
-#include <win2k.h>
-
#include <newpluginapi.h>
-#include <m_system.h>
-#include <m_database.h>
#include <m_langpack.h>
-#include <m_button.h>
-#include <m_clist.h>
-#include <m_clc.h>
-#include <m_clui.h>
-#include <m_options.h>
-#include <m_protosvc.h>
-#include <m_utils.h>
-#include <m_skin.h>
-#include <m_contacts.h>
-#include <m_userinfo.h>
-#include <m_history.h>
-#include <m_addcontact.h>
-#include <m_message.h>
-#include <m_file.h>
-#include <m_icolib.h>
-#include <m_fontservice.h>
-#include <m_timezones.h>
-#include <m_avatars.h>
#include <m_netlib.h>
-#include <m_metacontacts.h>
#include <m_popup.h>
#include <m_ssl.h>
diff --git a/src/core/stdssl/stdssl.vcxproj b/src/core/stdssl/stdssl.vcxproj index 48eeac6f40..6a38265b4b 100644 --- a/src/core/stdssl/stdssl.vcxproj +++ b/src/core/stdssl/stdssl.vcxproj @@ -25,4 +25,12 @@ <ImportGroup Label="PropertySheets">
<Import Project="$(ProjectDir)..\..\..\build\vc.common\core.props" />
</ImportGroup>
+ <ItemDefinitionGroup>
+ <ClCompile>
+ <ExceptionHandling>Sync</ExceptionHandling>
+ </ClCompile>
+ <Link>
+ <AdditionalDependencies>secur32.lib;crypt32.lib;wsock32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ </Link>
+ </ItemDefinitionGroup>
</Project>
\ No newline at end of file |