From 3cb3883908e3168e5f955be3143771721614307a Mon Sep 17 00:00:00 2001
From: George Hazan <ghazan@miranda.im>
Date: Thu, 12 Jan 2017 21:27:03 +0300
Subject: Netlib_FreeHttpRequest() instead of MS_NETLIB_FREEHTTPREQUESTSTRUCT

---
 protocols/VKontakte/src/vk_captcha.cpp    | 2 +-
 protocols/VKontakte/src/vk_pollserver.cpp | 6 +++---
 protocols/VKontakte/src/vk_queue.cpp      | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'protocols/VKontakte/src')

diff --git a/protocols/VKontakte/src/vk_captcha.cpp b/protocols/VKontakte/src/vk_captcha.cpp
index 807e367453..98fa443e86 100644
--- a/protocols/VKontakte/src/vk_captcha.cpp
+++ b/protocols/VKontakte/src/vk_captcha.cpp
@@ -38,7 +38,7 @@ bool CVkProto::RunCaptchaForm(LPCSTR szUrl, CMStringA &result)
 		req.szUrl = (LPSTR)szUrl;
 		req.flags = VK_NODUMPHEADERS;
 
-		NETLIBHTTPREQUEST *reply = (NETLIBHTTPREQUEST*)CallService(MS_NETLIB_HTTPTRANSACTION, (WPARAM)m_hNetlibUser, (LPARAM)&req);
+		NETLIBHTTPREQUEST *reply = Netlib_HttpTransaction(m_hNetlibUser, &req);
 		if (reply == NULL)
 			return false;
 
diff --git a/protocols/VKontakte/src/vk_pollserver.cpp b/protocols/VKontakte/src/vk_pollserver.cpp
index 9e108cdc66..e2931e62b4 100644
--- a/protocols/VKontakte/src/vk_pollserver.cpp
+++ b/protocols/VKontakte/src/vk_pollserver.cpp
@@ -201,7 +201,7 @@ int CVkProto::PollServer()
 	req.timeout = 30000;
 	req.nlc = m_pollingConn;
 
-	while ((reply = (NETLIBHTTPREQUEST*)CallService(MS_NETLIB_HTTPTRANSACTION, (WPARAM)m_hNetlibUser, (LPARAM)&req)) == NULL) {
+	while ((reply = Netlib_HttpTransaction(m_hNetlibUser, &req)) == NULL) {
 		debugLogA("CVkProto::PollServer is dead");
 		m_pollingConn = NULL;
 		if (iPollConnRetry && !m_bTerminated) {
@@ -239,14 +239,14 @@ int CVkProto::PollServer()
 		|| (reply->resultCode >= 500 && reply->resultCode <= 509)) {
 		debugLogA("CVkProto::PollServer is dead. Error code - %d", reply->resultCode);
 		m_pollingConn = NULL;
-		CallService(MS_NETLIB_FREEHTTPREQUESTSTRUCT, 0, (LPARAM)reply);
+		Netlib_FreeHttpRequest(reply);
 		ShutdownSession();
 		return 0;
 	}
 
 	m_pollingConn = reply->nlc;
 
-	CallService(MS_NETLIB_FREEHTTPREQUESTSTRUCT, 0, (LPARAM)reply);
+	Netlib_FreeHttpRequest(reply);
 	debugLogA("CVkProto::PollServer return %d", retVal);
 	return retVal;
 }
diff --git a/protocols/VKontakte/src/vk_queue.cpp b/protocols/VKontakte/src/vk_queue.cpp
index 6bd1a3d583..870575837b 100644
--- a/protocols/VKontakte/src/vk_queue.cpp
+++ b/protocols/VKontakte/src/vk_queue.cpp
@@ -55,7 +55,7 @@ void CVkProto::ExecuteRequest(AsyncHttpRequest *pReq)
 		}
 
 		debugLogA("CVkProto::ExecuteRequest \n====\n%s\n====\n", pReq->szUrl);
-		NETLIBHTTPREQUEST *reply = (NETLIBHTTPREQUEST*)CallService(MS_NETLIB_HTTPTRANSACTION, (WPARAM)m_hNetlibUser, (LPARAM)pReq);
+		NETLIBHTTPREQUEST *reply = Netlib_HttpTransaction(m_hNetlibUser, pReq);
 		if (reply != NULL) {
 			if (pReq->m_pFunc != NULL)
 				(this->*(pReq->m_pFunc))(reply, pReq); // may be set pReq->bNeedsRestart 
@@ -63,7 +63,7 @@ void CVkProto::ExecuteRequest(AsyncHttpRequest *pReq)
 			if (pReq->m_bApiReq)
 				m_hAPIConnection = reply->nlc;
 
-			CallService(MS_NETLIB_FREEHTTPREQUESTSTRUCT, 0, (LPARAM)reply);
+			Netlib_FreeHttpRequest(reply);
 		}
 		else if (pReq->bIsMainConn) {
 			if (IsStatusConnecting(m_iStatus))
-- 
cgit v1.2.3