From bb03623fd3ba7b9cc456da2c9504bad87b80ace0 Mon Sep 17 00:00:00 2001
From: George Hazan <ghazan@miranda.im>
Date: Wed, 11 Jan 2017 19:51:30 +0300
Subject: - Netlib_Send & Netlib_Recv helpers became real functions,
 MS_NETLIB_SEND & MS_NETLIB_RECV died;

- fix for dumping chunked http replies into a network log
---
 plugins/CryptoPP/src/main.cpp          |  3 +--
 plugins/SecureIM/src/commonheaders.cpp |  3 +--
 plugins/Utils.pas/mirutils.pas         |  6 +++---
 plugins/Watrack/myshows/i_cookies.inc  |  2 +-
 plugins/YAMN/src/proto/netlib.cpp      | 12 ++----------
 plugins/mRadio/mradio.dpr              |  2 +-
 6 files changed, 9 insertions(+), 19 deletions(-)

(limited to 'plugins')

diff --git a/plugins/CryptoPP/src/main.cpp b/plugins/CryptoPP/src/main.cpp
index 22be7cadba..62a75b02b3 100644
--- a/plugins/CryptoPP/src/main.cpp
+++ b/plugins/CryptoPP/src/main.cpp
@@ -130,8 +130,7 @@ void InitNetlib()
 
 void DeinitNetlib()
 {
-	if (hNetlibUser)
-		CallService(MS_NETLIB_CLOSEHANDLE, (WPARAM)hNetlibUser, 0);
+	Netlib_CloseHandle(hNetlibUser);
 }
 
 int Sent_NetLog(const char *fmt, ...)
diff --git a/plugins/SecureIM/src/commonheaders.cpp b/plugins/SecureIM/src/commonheaders.cpp
index eca5257814..0ac3f749e3 100644
--- a/plugins/SecureIM/src/commonheaders.cpp
+++ b/plugins/SecureIM/src/commonheaders.cpp
@@ -107,8 +107,7 @@ void InitNetlib()
 
 void DeinitNetlib()
 {
-	if (hNetlibUser)
-		CallService(MS_NETLIB_CLOSEHANDLE, (WPARAM)hNetlibUser, 0);
+	Netlib_CloseHandle(hNetlibUser);
 }
 
 int Sent_NetLog(const char *fmt, ...)
diff --git a/plugins/Utils.pas/mirutils.pas b/plugins/Utils.pas/mirutils.pas
index 10f2ea2578..4ede3640a2 100644
--- a/plugins/Utils.pas/mirutils.pas
+++ b/plugins/Utils.pas/mirutils.pas
@@ -458,7 +458,7 @@ begin
   end;
 
   if (hNetLib=0) and (nlu.cbSize<>0) then
-    CallService(MS_NETLIB_CLOSEHANDLE,hTmpNetLib,0);
+    Netlib_CloseHandle(hTmpNetLib);
 end;
 
 (*
@@ -537,7 +537,7 @@ begin
     CallService(MS_NETLIB_FREEHTTPREQUESTSTRUCT,0,lparam(resp));
 
     if nlu.cbSize<>0 then
-      CallService(MS_NETLIB_CLOSEHANDLE,hNetLib,0);
+      Netlib_CloseHandle(hNetLib);
   end;
 end;
 
@@ -640,7 +640,7 @@ begin
     end;
     CallService(MS_NETLIB_FREEHTTPREQUESTSTRUCT,0,lparam(resp));
   end;
-  CallService(MS_NETLIB_CLOSEHANDLE,hNetLib,0);
+  Netlib_CloseHandle(hNetLib);
 end;
 
 function RegisterSingleIcon(resname,ilname,descr,group:PAnsiChar):int;
diff --git a/plugins/Watrack/myshows/i_cookies.inc b/plugins/Watrack/myshows/i_cookies.inc
index 1258490199..3241134cf3 100644
--- a/plugins/Watrack/myshows/i_cookies.inc
+++ b/plugins/Watrack/myshows/i_cookies.inc
@@ -87,5 +87,5 @@ begin
     CallService(MS_NETLIB_FREEHTTPREQUESTSTRUCT,0,lparam(resp));
   end;
 
-  CallService(MS_NETLIB_CLOSEHANDLE,hTmpNetLib,0);
+  Netlib_CloseHandle(hTmpNetLib);
 end;
diff --git a/plugins/YAMN/src/proto/netlib.cpp b/plugins/YAMN/src/proto/netlib.cpp
index 0d8df55ab1..cc8f73a602 100644
--- a/plugins/YAMN/src/proto/netlib.cpp
+++ b/plugins/YAMN/src/proto/netlib.cpp
@@ -119,14 +119,7 @@ void CNLClient::Connect(const char* servername, const int port) throw(DWORD)
 // query- command to send
 int CNLClient::LocalNetlib_Send(HANDLE hConn, const char *buf, int len, int flags)
 {
-	if (isTLSed) {
-		#ifdef DEBUG_COMM
-		SSL_DebugLog("SSL send: %s", buf);
-		#endif
-	}
-
-	NETLIBBUFFER nlb = { (char*)buf,len,flags };
-	return CallService(MS_NETLIB_SEND, (WPARAM)hConn, (LPARAM)&nlb);
+	return Netlib_Send(hConn, buf, len, flags);
 }
 
 void CNLClient::Send(const char *query) throw(DWORD)
@@ -166,8 +159,7 @@ void CNLClient::Send(const char *query) throw(DWORD)
 
 int CNLClient::LocalNetlib_Recv(HANDLE hConn, char *buf, int len, int flags)
 {
-	NETLIBBUFFER nlb = { buf,len,flags };
-	int iReturn = CallService(MS_NETLIB_RECV, (WPARAM)hConn, (LPARAM)&nlb);
+	int iReturn = Netlib_Recv(hConn, buf, len, flags);
 	if (isTLSed) {
 		#ifdef DEBUG_COMM
 		SSL_DebugLog("SSL recv: %s", buf);
diff --git a/plugins/mRadio/mradio.dpr b/plugins/mRadio/mradio.dpr
index 3843cf56cd..3c3a5c3050 100644
--- a/plugins/mRadio/mradio.dpr
+++ b/plugins/mRadio/mradio.dpr
@@ -130,7 +130,7 @@ begin
 
   DestroyHookableEvent(hhRadioStatus);
 
-  CallService(MS_NETLIB_CLOSEHANDLE,hNetLib,0);
+  Netlib_CloseHandle(hNetLib);
 
   mFreeMem(storage);
   mFreeMem(storagep);
-- 
cgit v1.2.3