Netlib_FreeHttpRequest() instead of MS_NETLIB_FREEHTTPREQUESTSTRUCT

7 files changed, 61 insertions, 60 deletions

diff --git a/protocols/MSN/src/msn_auth.cpp b/protocols/MSN/src/msn_auth.cpp
index 5e6631e242..5501cc4b51 100644
--- a/protocols/MSN/src/msn_auth.cpp
+++ b/protocols/MSN/src/msn_auth.cpp
@@ -286,7 +286,7 @@ bool SkypeToken::Refresh(bool bForce)
 	}

 

 	m_proto->mHttpsTS = clock();

-	NETLIBHTTPREQUEST *nlhrReply = (NETLIBHTTPREQUEST*)CallService(MS_NETLIB_HTTPTRANSACTION, (WPARAM)m_proto->hNetlibUserHttps, (LPARAM)&nlhr);

+	NETLIBHTTPREQUEST *nlhrReply = Netlib_HttpTransaction(m_proto->hNetlibUserHttps, &nlhr);

 	m_proto->mHttpsTS = clock();

 

 	if (nlhrReply)  {

@@ -312,7 +312,7 @@ bool SkypeToken::Refresh(bool bForce)
 				bRet=true;

 			}

 		}

-		CallService(MS_NETLIB_FREEHTTPREQUESTSTRUCT, 0, (LPARAM)nlhrReply);

+		Netlib_FreeHttpRequest(nlhrReply);

 	} else m_proto->hHttpsConnection = NULL;

 	return bRet;

 }

@@ -795,7 +795,7 @@ bool CMsnProto::RefreshOAuth(const char *pszRefreshToken, const char *pszService
 

 	// Query

 	mHttpsTS = clock();

-	NETLIBHTTPREQUEST *nlhrReply = (NETLIBHTTPREQUEST*)CallService(MS_NETLIB_HTTPTRANSACTION, (WPARAM)hNetlibUserHttps, (LPARAM)&nlhr);

+	NETLIBHTTPREQUEST *nlhrReply = Netlib_HttpTransaction(hNetlibUserHttps, &nlhr);

 	mHttpsTS = clock();

 	if (nlhrReply)  {

 		hHttpsConnection = nlhrReply->nlc;

@@ -816,7 +816,7 @@ bool CMsnProto::RefreshOAuth(const char *pszRefreshToken, const char *pszService
 				}

 			}

 		}

-		CallService(MS_NETLIB_FREEHTTPREQUESTSTRUCT, 0, (LPARAM)nlhrReply);

+		Netlib_FreeHttpRequest(nlhrReply);

 	} else hHttpsConnection = NULL;

 	return bRet;

 }

@@ -1117,7 +1117,7 @@ int CMsnProto::MSN_AuthOAuth(void)
 	// Get oauth20 login data

 	nlhr.szUrl = AUTH_URL;

 	mHttpsTS = clock();

-	NETLIBHTTPREQUEST *nlhrReply = (NETLIBHTTPREQUEST*)CallService(MS_NETLIB_HTTPTRANSACTION, (WPARAM)hNetlibUserHttps, (LPARAM)&nlhr);

+	NETLIBHTTPREQUEST *nlhrReply = Netlib_HttpTransaction(hNetlibUserHttps, &nlhr);

 	mHttpsTS = clock();

 

 	if (nlhrReply)  {

@@ -1142,7 +1142,7 @@ int CMsnProto::MSN_AuthOAuth(void)
 				nlhr.flags &= (~NLHRF_REDIRECT);

 				mHttpsTS = clock();

 				nlhr.nlc = hHttpsConnection;

-				NETLIBHTTPREQUEST *nlhrReply2 = (NETLIBHTTPREQUEST*)CallService(MS_NETLIB_HTTPTRANSACTION, (WPARAM)hNetlibUserHttps, (LPARAM)&nlhr);

+				NETLIBHTTPREQUEST *nlhrReply2 = Netlib_HttpTransaction(hNetlibUserHttps, &nlhr);

 				mHttpsTS = clock();

 				if (nlhrReply2) {

 					char *pszURL=NULL, *pAccessToken, *pEnd;

@@ -1171,14 +1171,14 @@ int CMsnProto::MSN_AuthOAuth(void)
 							pszURL = param.pszURL;

 							mir_free(authCookies);

 							authCookies = nlhr.headers[1].szValue = param.pszCookies;

-							CallService(MS_NETLIB_FREEHTTPREQUESTSTRUCT, 0, (LPARAM)nlhrReply2);

+							Netlib_FreeHttpRequest(nlhrReply2);

 							nlhrReply2 = NULL;

 							bAskingForAuth = false;

 							bPassportAuth = false;

 						}

 					}

 					setByte("PassportAuth", bPassportAuth);

-					CallService(MS_NETLIB_FREEHTTPREQUESTSTRUCT, 0, (LPARAM)nlhrReply);

+					Netlib_FreeHttpRequest(nlhrReply);

 					nlhrReply = nlhrReply2;

 

 					if (pszURL &&

@@ -1245,8 +1245,9 @@ int CMsnProto::MSN_AuthOAuth(void)
 

 							/* Request MappingContainer */

 							mHttpsTS = clock();

-							if (nlhrReply) CallService(MS_NETLIB_FREEHTTPREQUESTSTRUCT, 0, (LPARAM)nlhrReply);

-							nlhrReply = (NETLIBHTTPREQUEST*)CallService(MS_NETLIB_HTTPTRANSACTION, (WPARAM)hNetlibUserHttps, (LPARAM)&nlhr);

+							if (nlhrReply)

+								Netlib_FreeHttpRequest(nlhrReply);

+							nlhrReply = Netlib_HttpTransaction(hNetlibUserHttps, &nlhr);

 							mHttpsTS = clock();

 							if (nlhrReply) {

 								hHttpsConnection = nlhrReply->nlc;

@@ -1275,8 +1276,10 @@ int CMsnProto::MSN_AuthOAuth(void)
 				else hHttpsConnection = NULL;

 			}

 		}

-		if (nlhrReply) CallService(MS_NETLIB_FREEHTTPREQUESTSTRUCT, 0, (LPARAM)nlhrReply);

-	} else hHttpsConnection = NULL;

+		if (nlhrReply)

+			Netlib_FreeHttpRequest(nlhrReply);

+	}

+	else hHttpsConnection = NULL;

 

 	if (retVal<=0) authSkypeComToken.Clear(); else {

 		if (bPassportAuth) {

diff --git a/protocols/MSN/src/msn_avatar.cpp b/protocols/MSN/src/msn_avatar.cpp
index 8b1e6e0d46..88491305fd 100644
--- a/protocols/MSN/src/msn_avatar.cpp
+++ b/protocols/MSN/src/msn_avatar.cpp
@@ -61,13 +61,13 @@ bool CMsnProto::loadHttpAvatar(AvatarQueueEntry *p)
 	nlhr.headers = (NETLIBHTTPHEADER*)&nlbhHeaders;

 	nlhr.headersCount = 1;

 

-	NETLIBHTTPREQUEST *nlhrReply = (NETLIBHTTPREQUEST*)CallService(MS_NETLIB_HTTPTRANSACTION, (WPARAM)m_hNetlibUser, (LPARAM)&nlhr);

+	NETLIBHTTPREQUEST *nlhrReply = Netlib_HttpTransaction(m_hNetlibUser, &nlhr);

 	if (nlhrReply == NULL)

 		return false;

 

 	if (nlhrReply->resultCode != 200 || nlhrReply->dataLength == 0) {

 LBL_Error:

-		CallService(MS_NETLIB_FREEHTTPREQUESTSTRUCT, 0, (LPARAM)nlhrReply);

+		Netlib_FreeHttpRequest(nlhrReply);

 		return false;

 	}

 

@@ -90,7 +90,7 @@ LBL_Error:
 	_close(fileId);

 

 	ProtoBroadcastAck(p->hContact, ACKTYPE_AVATAR, ACKRESULT_SUCCESS, &ai, 0);

-	CallService(MS_NETLIB_FREEHTTPREQUESTSTRUCT, 0, (LPARAM)nlhrReply);

+	Netlib_FreeHttpRequest(nlhrReply);

 	return true;

 }

 

diff --git a/protocols/MSN/src/msn_commands.cpp b/protocols/MSN/src/msn_commands.cpp
index 9e148547fb..cdea188a44 100644
--- a/protocols/MSN/src/msn_commands.cpp
+++ b/protocols/MSN/src/msn_commands.cpp
@@ -476,7 +476,7 @@ void CMsnProto::MSN_ProcessURIObject(MCONTACT hContact, ezxml_t xmli)
 			nlhr.nlc = hHttpsConnection;

 

 			mHttpsTS = clock();

-			nlhrReply = (NETLIBHTTPREQUEST*)CallService(MS_NETLIB_HTTPTRANSACTION, (WPARAM)hNetlibUserHttps, (LPARAM)&nlhr);

+			nlhrReply = Netlib_HttpTransaction(hNetlibUserHttps, &nlhr);

 			mHttpsTS = clock();

 			if (nlhrReply) {

 				hHttpsConnection = nlhrReply->nlc;

@@ -491,7 +491,7 @@ void CMsnProto::MSN_ProcessURIObject(MCONTACT hContact, ezxml_t xmli)
 					}

 				}

 

-				CallService(MS_NETLIB_FREEHTTPREQUESTSTRUCT, 0, (LPARAM)nlhrReply);

+				Netlib_FreeHttpRequest(nlhrReply);

 			}  else hHttpsConnection = NULL;

 

 			if (fileSize) {

diff --git a/protocols/MSN/src/msn_proto.cpp b/protocols/MSN/src/msn_proto.cpp
index 61eab09889..0f1a20f5fd 100644
--- a/protocols/MSN/src/msn_proto.cpp
+++ b/protocols/MSN/src/msn_proto.cpp
@@ -541,26 +541,24 @@ void __cdecl CMsnProto::MsnFileAckThread(void* arg)
 			if (nloc.flags & NLOCF_SSL) nlhr.flags |= NLHRF_SSL;

 			HANDLE nlc = (HANDLE)CallService(MS_NETLIB_OPENCONNECTION, (WPARAM)m_hNetlibUser, (LPARAM)&nloc);

 

-			if (nlc && CallService(MS_NETLIB_SENDHTTPREQUEST, (WPARAM)nlc, (LPARAM)&nlhr) != SOCKET_ERROR &&

-				(nlhrReply = (NETLIBHTTPREQUEST*)CallService(MS_NETLIB_RECVHTTPHEADERS, (WPARAM)nlc, 0))) 

-			{

-					if (nlhrReply->resultCode == 200 || nlhrReply->resultCode == 206) {

-						INT_PTR dw;

-						char buf[1024];

-

-						ProtoBroadcastAck(ft->std.hContact, ACKTYPE_FILE, ACKRESULT_CONNECTED, ft, 0);

-						while (!ft->bCanceled && ft->std.currentFileProgress < ft->std.currentFileSize &&

-							(dw = Netlib_Recv(nlc, buf, sizeof(buf), MSG_NODUMP))>0 && dw!=SOCKET_ERROR) 

-						{

-							_write(ft->fileId, buf, dw);

-							ft->std.totalProgress += dw;

-							ft->std.currentFileProgress += dw;

-							ProtoBroadcastAck(ft->std.hContact, ACKTYPE_FILE, ACKRESULT_DATA, ft, (LPARAM)&ft->std);

-						}

-						if (ft->std.currentFileProgress == ft->std.currentFileSize) ft->std.currentFileNumber++;

-

+			if (nlc && CallService(MS_NETLIB_SENDHTTPREQUEST, (WPARAM)nlc, (LPARAM)&nlhr) != SOCKET_ERROR && (nlhrReply = Netlib_RecvHttpHeaders(nlc))) {

+				if (nlhrReply->resultCode == 200 || nlhrReply->resultCode == 206) {

+					INT_PTR dw;

+					char buf[1024];

+

+					ProtoBroadcastAck(ft->std.hContact, ACKTYPE_FILE, ACKRESULT_CONNECTED, ft, 0);

+					while (!ft->bCanceled && ft->std.currentFileProgress < ft->std.currentFileSize &&

+						(dw = Netlib_Recv(nlc, buf, sizeof(buf), MSG_NODUMP))>0 && dw!=SOCKET_ERROR) 

+					{

+						_write(ft->fileId, buf, dw);

+						ft->std.totalProgress += dw;

+						ft->std.currentFileProgress += dw;

+						ProtoBroadcastAck(ft->std.hContact, ACKTYPE_FILE, ACKRESULT_DATA, ft, (LPARAM)&ft->std);

 					}

-					CallService(MS_NETLIB_FREEHTTPREQUESTSTRUCT, 0, (LPARAM)nlhrReply);

+					if (ft->std.currentFileProgress == ft->std.currentFileSize) ft->std.currentFileNumber++;

+

+				}

+				Netlib_FreeHttpRequest(nlhrReply);

 			}

 			Netlib_CloseHandle(nlc);

 			mir_free((char*)nloc.szHost);

diff --git a/protocols/MSN/src/msn_skypeab.cpp b/protocols/MSN/src/msn_skypeab.cpp
index 604219b292..1a34f71ec0 100644
--- a/protocols/MSN/src/msn_skypeab.cpp
+++ b/protocols/MSN/src/msn_skypeab.cpp
@@ -68,7 +68,7 @@ bool CMsnProto::MSN_SKYABRefreshClist(void)
 

 	// Query addressbook

 	mHttpsTS = clock();

-	NETLIBHTTPREQUEST *nlhrReply = (NETLIBHTTPREQUEST*)CallService(MS_NETLIB_HTTPTRANSACTION, (WPARAM)hNetlibUserHttps, (LPARAM)&nlhr);

+	NETLIBHTTPREQUEST *nlhrReply = Netlib_HttpTransaction(hNetlibUserHttps, &nlhr);

 	mHttpsTS = clock();

 	if (nlhrReply) {

 		hHttpsConnection = nlhrReply->nlc;

@@ -101,7 +101,7 @@ bool CMsnProto::MSN_SKYABRefreshClist(void)
 			json_delete(items);

 			MSN_SKYABGetProfiles((const char*)post);

 		}

-		CallService(MS_NETLIB_FREEHTTPREQUESTSTRUCT, 0, (LPARAM)nlhrReply);

+		Netlib_FreeHttpRequest(nlhrReply);

 	}

 	else hHttpsConnection = NULL;

 	return bRet;

@@ -122,7 +122,7 @@ bool CMsnProto::MSN_SKYABGetProfiles(const char *pszPOST)
 	nlhr.pData = (char*)pszPOST;

 

 	mHttpsTS = clock();

-	NETLIBHTTPREQUEST *nlhrReply = (NETLIBHTTPREQUEST*)CallService(MS_NETLIB_HTTPTRANSACTION, (WPARAM)hNetlibUserHttps, (LPARAM)&nlhr);

+	NETLIBHTTPREQUEST *nlhrReply = Netlib_HttpTransaction(hNetlibUserHttps, &nlhr);

 	mHttpsTS = clock();

 	if (nlhrReply) {

 		hHttpsConnection = nlhrReply->nlc;

@@ -155,7 +155,7 @@ bool CMsnProto::MSN_SKYABGetProfiles(const char *pszPOST)
 			json_delete(items);

 			bRet = true;

 		}

-		CallService(MS_NETLIB_FREEHTTPREQUESTSTRUCT, 0, (LPARAM)nlhrReply);

+		Netlib_FreeHttpRequest(nlhrReply);

 	}

 	else hHttpsConnection = NULL;

 	return bRet;

@@ -175,7 +175,7 @@ bool CMsnProto::MSN_SKYABGetProfile(const char *wlid)
 	nlhr.szUrl = szURL;

 

 	mHttpsTS = clock();

-	NETLIBHTTPREQUEST *nlhrReply = (NETLIBHTTPREQUEST*)CallService(MS_NETLIB_HTTPTRANSACTION, (WPARAM)hNetlibUserHttps, (LPARAM)&nlhr);

+	NETLIBHTTPREQUEST *nlhrReply = Netlib_HttpTransaction(hNetlibUserHttps, &nlhr);

 	mHttpsTS = clock();

 	if (nlhrReply) {

 		hHttpsConnection = nlhrReply->nlc;

@@ -227,7 +227,7 @@ bool CMsnProto::MSN_SKYABGetProfile(const char *wlid)
 			}

 			bRet = true;

 		}

-		CallService(MS_NETLIB_FREEHTTPREQUESTSTRUCT, 0, (LPARAM)nlhrReply);

+		Netlib_FreeHttpRequest(nlhrReply);

 	}

 	else hHttpsConnection = NULL;

 	return bRet;

@@ -253,11 +253,11 @@ bool CMsnProto::MSN_SKYABBlockContact(const char *wlid, const char *pszAction)
 	nlhr.pData = szPOST;

 

 	mHttpsTS = clock();

-	NETLIBHTTPREQUEST *nlhrReply = (NETLIBHTTPREQUEST*)CallService(MS_NETLIB_HTTPTRANSACTION, (WPARAM)hNetlibUserHttps, (LPARAM)&nlhr);

+	NETLIBHTTPREQUEST *nlhrReply = Netlib_HttpTransaction(hNetlibUserHttps, &nlhr);

 	mHttpsTS = clock();

 	if (nlhrReply) {

 		hHttpsConnection = nlhrReply->nlc;

-		CallService(MS_NETLIB_FREEHTTPREQUESTSTRUCT, 0, (LPARAM)nlhrReply);

+		Netlib_FreeHttpRequest(nlhrReply);

 		bRet = true;

 	}

 	else hHttpsConnection = NULL;

@@ -281,11 +281,11 @@ bool CMsnProto::MSN_SKYABDeleteContact(const char *wlid)
 	nlhr.headersCount++;

 

 	mHttpsTS = clock();

-	NETLIBHTTPREQUEST *nlhrReply = (NETLIBHTTPREQUEST*)CallService(MS_NETLIB_HTTPTRANSACTION, (WPARAM)hNetlibUserHttps, (LPARAM)&nlhr);

+	NETLIBHTTPREQUEST *nlhrReply = Netlib_HttpTransaction(hNetlibUserHttps, &nlhr);

 	mHttpsTS = clock();

 	if (nlhrReply) {

 		hHttpsConnection = nlhrReply->nlc;

-		CallService(MS_NETLIB_FREEHTTPREQUESTSTRUCT, 0, (LPARAM)nlhrReply);

+		Netlib_FreeHttpRequest(nlhrReply);

 		bRet = true;

 	}

 	else hHttpsConnection = NULL;

@@ -307,11 +307,11 @@ bool CMsnProto::MSN_SKYABAuthRsp(const char *wlid, const char *pszAction)
 	nlhr.szUrl = szURL;

 

 	mHttpsTS = clock();

-	NETLIBHTTPREQUEST *nlhrReply = (NETLIBHTTPREQUEST*)CallService(MS_NETLIB_HTTPTRANSACTION, (WPARAM)hNetlibUserHttps, (LPARAM)&nlhr);

+	NETLIBHTTPREQUEST *nlhrReply = Netlib_HttpTransaction(hNetlibUserHttps, &nlhr);

 	mHttpsTS = clock();

 	if (nlhrReply) {

 		hHttpsConnection = nlhrReply->nlc;

-		CallService(MS_NETLIB_FREEHTTPREQUESTSTRUCT, 0, (LPARAM)nlhrReply);

+		Netlib_FreeHttpRequest(nlhrReply);

 		bRet = true;

 	}

 	else hHttpsConnection = NULL;

@@ -339,11 +339,11 @@ bool CMsnProto::MSN_SKYABAuthRq(const char *wlid, const char *pszGreeting)
 	nlhr.pData = (char*)(const char*)post;

 

 	mHttpsTS = clock();

-	NETLIBHTTPREQUEST *nlhrReply = (NETLIBHTTPREQUEST*)CallService(MS_NETLIB_HTTPTRANSACTION, (WPARAM)hNetlibUserHttps, (LPARAM)&nlhr);

+	NETLIBHTTPREQUEST *nlhrReply = Netlib_HttpTransaction(hNetlibUserHttps, &nlhr);

 	mHttpsTS = clock();

 	if (nlhrReply) {

 		hHttpsConnection = nlhrReply->nlc;

-		CallService(MS_NETLIB_FREEHTTPREQUESTSTRUCT, 0, (LPARAM)nlhrReply);

+		Netlib_FreeHttpRequest(nlhrReply);

 		bRet = true;

 	}

 	else hHttpsConnection = NULL;

@@ -370,7 +370,7 @@ bool CMsnProto::MSN_SKYABSearch(const char *keyWord, HANDLE hSearch)
 	nlhr.headersCount++;

 

 	mHttpsTS = clock();

-	NETLIBHTTPREQUEST *nlhrReply = (NETLIBHTTPREQUEST*)CallService(MS_NETLIB_HTTPTRANSACTION, (WPARAM)hNetlibUserHttps, (LPARAM)&nlhr);

+	NETLIBHTTPREQUEST *nlhrReply = Netlib_HttpTransaction(hNetlibUserHttps, &nlhr);

 	mHttpsTS = clock();

 	if (nlhrReply) {

 		hHttpsConnection = nlhrReply->nlc;

@@ -400,7 +400,7 @@ bool CMsnProto::MSN_SKYABSearch(const char *keyWord, HANDLE hSearch)
 			ProtoBroadcastAck(0, ACKTYPE_SEARCH, ACKRESULT_SUCCESS, hSearch, 0);

 			bRet = true;

 		}

-		CallService(MS_NETLIB_FREEHTTPREQUESTSTRUCT, 0, (LPARAM)nlhrReply);

+		Netlib_FreeHttpRequest(nlhrReply);

 	}

 	else hHttpsConnection = NULL;

 	return bRet;

diff --git a/protocols/MSN/src/msn_soapab.cpp b/protocols/MSN/src/msn_soapab.cpp
index e8c28d2cb6..084f63bcea 100644
--- a/protocols/MSN/src/msn_soapab.cpp
+++ b/protocols/MSN/src/msn_soapab.cpp
@@ -862,7 +862,7 @@ bool CMsnProto::MSN_ABRefreshClist(unsigned int nTry)
 

 	// Query addressbook

 	mHttpsTS = clock();

-	NETLIBHTTPREQUEST *nlhrReply = (NETLIBHTTPREQUEST*)CallService(MS_NETLIB_HTTPTRANSACTION, (WPARAM)hNetlibUserHttps, (LPARAM)&nlhr);

+	NETLIBHTTPREQUEST *nlhrReply = Netlib_HttpTransaction(hNetlibUserHttps, &nlhr);

 	mHttpsTS = clock();

 	if (nlhrReply)  {

 		hHttpsConnection = nlhrReply->nlc;

@@ -946,8 +946,9 @@ bool CMsnProto::MSN_ABRefreshClist(unsigned int nTry)
 			authSkypeComToken.Clear();

 			if (MSN_AuthOAuth() > 0) return MSN_ABRefreshClist(1);

 		}

-		CallService(MS_NETLIB_FREEHTTPREQUESTSTRUCT, 0, (LPARAM)nlhrReply);

-	} else hHttpsConnection = NULL;

+		Netlib_FreeHttpRequest(nlhrReply);

+	}

+	else hHttpsConnection = NULL;

 	return bRet;

 }

 

diff --git a/protocols/MSN/src/msn_ssl.cpp b/protocols/MSN/src/msn_ssl.cpp
index 6bcfcffeb8..7e8541ab7c 100644
--- a/protocols/MSN/src/msn_ssl.cpp
+++ b/protocols/MSN/src/msn_ssl.cpp
@@ -76,7 +76,7 @@ char* CMsnProto::getSslResult(char** parUrl, const char* parAuthInfo, const char
 	}

 

 	// download the page

-	NETLIBHTTPREQUEST *nlhrReply = (NETLIBHTTPREQUEST*)CallService(MS_NETLIB_HTTPTRANSACTION, (WPARAM)hNetlibUserHttps, (LPARAM)&nlhr);

+	NETLIBHTTPREQUEST *nlhrReply = Netlib_HttpTransaction(hNetlibUserHttps, &nlhr);

 

 	if (nlhrReply) {

 		hHttpsConnection = nlhrReply->nlc;

@@ -93,7 +93,7 @@ char* CMsnProto::getSslResult(char** parUrl, const char* parAuthInfo, const char
 		nlhrReply->dataLength = 0;

 		nlhrReply->pData = NULL;

 

-		CallService(MS_NETLIB_FREEHTTPREQUESTSTRUCT, 0, (LPARAM)nlhrReply);

+		Netlib_FreeHttpRequest(nlhrReply);

 	}

 	else

 		hHttpsConnection = NULL;

@@ -120,15 +120,14 @@ bool CMsnProto::getMyAvatarFile(char *url, wchar_t *fname)
 	nlhr.headers[0].szValue = (char*)MSN_USER_AGENT;

 

 	// download the page

-	NETLIBHTTPREQUEST *nlhrReply = (NETLIBHTTPREQUEST*)CallService(MS_NETLIB_HTTPTRANSACTION, (WPARAM)hNetlibUserHttps, (LPARAM)&nlhr);

-

+	NETLIBHTTPREQUEST *nlhrReply = Netlib_HttpTransaction(hNetlibUserHttps, &nlhr);

 	if (nlhrReply) {

 		if (nlhrReply->resultCode == 200 && nlhrReply->dataLength)

 			MSN_SetMyAvatar(fname, nlhrReply->pData, nlhrReply->dataLength);

 		else

 			result = false;

 

-		CallService(MS_NETLIB_FREEHTTPREQUESTSTRUCT, 0, (LPARAM)nlhrReply);

+		Netlib_FreeHttpRequest(nlhrReply);

 	}

 	return result;

 }