attempt to unify AsyncHttpRequest in various protocols

3 files changed, 111 insertions, 0 deletions

diff --git a/src/mir_app/src/MHttpRequest.cpp b/src/mir_app/src/MHttpRequest.cpp
new file mode 100644
index 0000000000..ce511f8e4b
--- /dev/null
+++ b/src/mir_app/src/MHttpRequest.cpp
@@ -0,0 +1,93 @@
+/*
+
+Miranda NG: the free IM client for Microsoft* Windows*
+
+Copyright (C) 2012-18 Miranda NG team,
+all portions of this codebase are copyrighted to the people
+listed in contributors.txt.
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+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.
+*/
+
+#include "stdafx.h"
+
+MHttpRequest::MHttpRequest()
+{
+	cbSize = sizeof(NETLIBHTTPREQUEST);
+	requestType = REQUEST_GET;
+}
+
+MHttpRequest::~MHttpRequest()
+{
+	for (int i = 0; i < headersCount; i++) {
+		mir_free(headers[i].szName);
+		mir_free(headers[i].szValue);
+	}
+	mir_free(headers);
+	mir_free(pData);
+}
+
+void MHttpRequest::AddHeader(LPCSTR szName, LPCSTR szValue)
+{
+	for (int i = 0; i < headersCount; i++)
+		if (!mir_strcmp(headers[i].szName, szName)) {
+			replaceStr(headers[i].szValue, szValue);
+			return;
+		}
+
+	headers = (NETLIBHTTPHEADER*)mir_realloc(headers, sizeof(NETLIBHTTPHEADER)*(headersCount + 1));
+	headers[headersCount].szName = mir_strdup(szName);
+	headers[headersCount].szValue = mir_strdup(szValue);
+	headersCount++;
+}
+
+/////////////////////////////////////////////////////////////////////////////////////////
+
+MIR_APP_DLL(MHttpRequest*) operator<<(MHttpRequest *pReq, const INT_PARAM &param)
+{
+	CMStringA &s = pReq->m_szParam;
+	if (!s.IsEmpty())
+		s.AppendChar('&');
+	s.AppendFormat("%s=%ld", param.szName, param.iValue);
+	return pReq;
+}
+
+MIR_APP_DLL(MHttpRequest*) operator<<(MHttpRequest *pReq, const INT64_PARAM &param)
+{
+	CMStringA &s = pReq->m_szParam;
+	if (!s.IsEmpty())
+		s.AppendChar('&');
+	s.AppendFormat("%s=%lld", param.szName, param.iValue);
+	return pReq;
+}
+
+MIR_APP_DLL(MHttpRequest*) operator<<(MHttpRequest *pReq, const CHAR_PARAM &param)
+{
+	CMStringA &s = pReq->m_szParam;
+	if (!s.IsEmpty())
+		s.AppendChar('&');
+	s.AppendFormat("%s=%s", param.szName, ptrA(mir_urlEncode(param.szValue)));
+	return pReq;
+}
+
+MIR_APP_DLL(MHttpRequest*) operator<<(MHttpRequest *pReq, const WCHAR_PARAM &param)
+{
+	T2Utf szValue(param.wszValue);
+	CMStringA &s = pReq->m_szParam;
+	if (!s.IsEmpty())
+		s.AppendChar('&');
+	s.AppendFormat("%s=%s", param.szName, ptrA(mir_urlEncode(szValue)));
+	return pReq;
+}
diff --git a/src/mir_app/src/mir_app.def b/src/mir_app/src/mir_app.def
index e3be5f3916..673016746d 100644
--- a/src/mir_app/src/mir_app.def
+++ b/src/mir_app/src/mir_app.def
@@ -671,3 +671,12 @@ g_hevSettingChanged @696 NONAME
 ?MetaRemoveSubHistory@MDatabaseReadonly@@UAGHPAUDBCachedContact@@@Z @704 NONAME

 Chat_GetGroup @705

 Chat_SetGroup @706

+??0MHttpRequest@@QAE@ABU0@@Z @707 NONAME

+??0MHttpRequest@@QAE@XZ @708 NONAME

+??1MHttpRequest@@QAE@XZ @709 NONAME

+??4MHttpRequest@@QAEAAU0@ABU0@@Z @710 NONAME

+??6@YGPAUMHttpRequest@@PAU0@ABUCHAR_PARAM@@@Z @711 NONAME

+??6@YGPAUMHttpRequest@@PAU0@ABUINT_PARAM@@@Z @712 NONAME

+??6@YGPAUMHttpRequest@@PAU0@ABUWCHAR_PARAM@@@Z @713 NONAME

+??6@YGPAUMHttpRequest@@PAU0@ABUINT64_PARAM@@@Z @714 NONAME

+?AddHeader@MHttpRequest@@QAEXPBD0@Z @715 NONAME

diff --git a/src/mir_app/src/mir_app64.def b/src/mir_app/src/mir_app64.def
index bb0746bc4e..513a79e71c 100644
--- a/src/mir_app/src/mir_app64.def
+++ b/src/mir_app/src/mir_app64.def
@@ -671,3 +671,12 @@ g_hevSettingChanged @696 NONAME
 ?MetaRemoveSubHistory@MDatabaseReadonly@@UEAAHPEAUDBCachedContact@@@Z @704 NONAME

 Chat_GetGroup @705

 Chat_SetGroup @706

+??0MHttpRequest@@QEAA@AEBU0@@Z @707 NONAME

+??0MHttpRequest@@QEAA@XZ @708 NONAME

+??1MHttpRequest@@QEAA@XZ @709 NONAME

+??4MHttpRequest@@QEAAAEAU0@AEBU0@@Z @710 NONAME

+??6@YAPEAUMHttpRequest@@PEAU0@AEBUCHAR_PARAM@@@Z @711 NONAME

+??6@YAPEAUMHttpRequest@@PEAU0@AEBUINT_PARAM@@@Z @712 NONAME

+??6@YAPEAUMHttpRequest@@PEAU0@AEBUWCHAR_PARAM@@@Z @713 NONAME

+??6@YAPEAUMHttpRequest@@PEAU0@AEBUINT64_PARAM@@@Z @714 NONAME

+?AddHeader@MHttpRequest@@QEAAXPEBD0@Z @715 NONAME