From b077e485892bf186cae0084aa4d45e468c530378 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Thu, 16 Feb 2017 23:14:03 +0300 Subject: dynamic loading of openssl removed --- protocols/MSN/src/msn_auth.cpp | 7 ------- protocols/MSN/src/msn_svcs.cpp | 2 +- protocols/MSN/src/stdafx.h | 2 +- protocols/MSN/src/version.h | 2 +- 4 files changed, 3 insertions(+), 10 deletions(-) (limited to 'protocols') diff --git a/protocols/MSN/src/msn_auth.cpp b/protocols/MSN/src/msn_auth.cpp index 5501cc4b51..e16cdd38e0 100644 --- a/protocols/MSN/src/msn_auth.cpp +++ b/protocols/MSN/src/msn_auth.cpp @@ -667,10 +667,6 @@ int CMsnProto::MSN_SkypeAuth(const char *pszNonce, char *pszUIC) { int iRet = -1; - if (g_hOpenssl == NULL) g_hOpenssl = LoadLibraryA("libeay32.dll"); - if (g_hOpenssl == NULL) - return iRet; - // Perform login SkyLogin hLogin = SkyLogin_Init(); if (hLogin) { @@ -702,9 +698,6 @@ int CMsnProto::MSN_SkypeAuth(const char *pszNonce, char *pszUIC) int CMsnProto::LoginSkypeOAuth(const char *pRefreshToken) { int iRet = -1; - if (g_hOpenssl == NULL) g_hOpenssl = LoadLibraryA("libeay32.dll"); - if (g_hOpenssl == NULL) - return iRet; // Perform login SkyLogin hLogin = SkyLogin_Init(); diff --git a/protocols/MSN/src/msn_svcs.cpp b/protocols/MSN/src/msn_svcs.cpp index a5138006b9..76eeb339ac 100644 --- a/protocols/MSN/src/msn_svcs.cpp +++ b/protocols/MSN/src/msn_svcs.cpp @@ -399,7 +399,7 @@ int CMsnProto::OnContactDeleted(WPARAM hContact, LPARAM) debugLogA("Deleted Handler Email"); if (Lists_IsInList(LIST_FL, szEmail)) { - DeleteParam param = { this, hContact }; + DeleteParam param = { this, MCONTACT(hContact) }; DialogBoxParam(g_hInst, MAKEINTRESOURCE(IDD_DELETECONTACT), NULL, DlgDeleteContactUI, (LPARAM)¶m); MsnContact *msc = Lists_Get(szEmail); diff --git a/protocols/MSN/src/stdafx.h b/protocols/MSN/src/stdafx.h index bc2b4cad1e..27667ebadd 100644 --- a/protocols/MSN/src/stdafx.h +++ b/protocols/MSN/src/stdafx.h @@ -931,7 +931,7 @@ const char msnStoreAppId[] = "Skype"; const char msnProductVer[] = "0/6.16.0.105/259/"; const char msnProtID[] = "MSNP24"; -extern HINSTANCE g_hInst, g_hOpenssl; +extern HINSTANCE g_hInst; extern bool g_bTerminated; /////////////////////////////////////////////////////////////////////////////// diff --git a/protocols/MSN/src/version.h b/protocols/MSN/src/version.h index 95e043c5f1..dc1e361c94 100644 --- a/protocols/MSN/src/version.h +++ b/protocols/MSN/src/version.h @@ -21,7 +21,7 @@ along with this program. If not, see . #define __MAJOR_VERSION 0 #define __MINOR_VERSION 12 #define __RELEASE_NUM 1 -#define __BUILD_NUM 2 +#define __BUILD_NUM 3 #include -- cgit v1.2.3