From 322fece4cdb97f834c3c13b7bb3157ba6e4fa449 Mon Sep 17 00:00:00 2001
From: George Hazan <ghazan@miranda.im>
Date: Mon, 11 Dec 2017 12:04:28 +0300
Subject: parameters unification between JSON & HTTP

---
 libs/libjson/src/libjson.def   |   5 +++++
 libs/libjson/src/libjson64.def |   5 +++++
 libs/libjson/src/stdafx.cxx    |  36 +++++++++++++++++++++++++++++++++++-
 libs/win32/libjson.lib         | Bin 63584 -> 65242 bytes
 libs/win64/libjson.lib         | Bin 64114 -> 65846 bytes
 5 files changed, 45 insertions(+), 1 deletion(-)

(limited to 'libs')

diff --git a/libs/libjson/src/libjson.def b/libs/libjson/src/libjson.def
index 9d8b63ec49..fcb01c7578 100644
--- a/libs/libjson/src/libjson.def
+++ b/libs/libjson/src/libjson.def
@@ -194,3 +194,8 @@ json_write @190
 json_write_formatted @191
 ??6JSONNode@@QAEAAV0@ABV0@@Z @192 NONAME
 ??4JSONWorker@@QAEAAV0@$$QAV0@@Z @193 NONAME
+??6@YGAAVJSONNode@@AAV0@ABUBOOL_PARAM@@@Z @194 NONAME
+??6@YGAAVJSONNode@@AAV0@ABUCHAR_PARAM@@@Z @195 NONAME
+??6@YGAAVJSONNode@@AAV0@ABUINT64_PARAM@@@Z @196 NONAME
+??6@YGAAVJSONNode@@AAV0@ABUINT_PARAM@@@Z @197 NONAME
+??6@YGAAVJSONNode@@AAV0@ABUWCHAR_PARAM@@@Z @198 NONAME
diff --git a/libs/libjson/src/libjson64.def b/libs/libjson/src/libjson64.def
index 1e501cba21..e9512805bd 100644
--- a/libs/libjson/src/libjson64.def
+++ b/libs/libjson/src/libjson64.def
@@ -194,3 +194,8 @@ json_write @190
 json_write_formatted @191
 ??6JSONNode@@QEAAAEAV0@AEBV0@@Z @192 NONAME
 ??4JSONWorker@@QEAAAEAV0@$$QEAV0@@Z @193 NONAME
+??6@YAAEAVJSONNode@@AEAV0@AEBUBOOL_PARAM@@@Z @194 NONAME
+??6@YAAEAVJSONNode@@AEAV0@AEBUCHAR_PARAM@@@Z @195 NONAME
+??6@YAAEAVJSONNode@@AEAV0@AEBUINT64_PARAM@@@Z @196 NONAME
+??6@YAAEAVJSONNode@@AEAV0@AEBUINT_PARAM@@@Z @197 NONAME
+??6@YAAEAVJSONNode@@AEAV0@AEBUWCHAR_PARAM@@@Z @198 NONAME
diff --git a/libs/libjson/src/stdafx.cxx b/libs/libjson/src/stdafx.cxx
index 6f97ed9a4e..21194081bc 100644
--- a/libs/libjson/src/stdafx.cxx
+++ b/libs/libjson/src/stdafx.cxx
@@ -16,4 +16,38 @@ You should have received a copy of the GNU General Public License
 along with this program. If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "stdafx.h"
\ No newline at end of file
+#include "stdafx.h"
+
+/////////////////////////////////////////////////////////////////////////////////////////
+
+LIBJSON_DLL(JSONNode&) operator<<(JSONNode &json, const INT_PARAM &param)
+{
+	json.push_back(JSONNode(param.szName, param.iValue));
+	return json;
+}
+
+LIBJSON_DLL(JSONNode&) operator<<(JSONNode &json, const INT64_PARAM &param)
+{
+	char tmp[100];
+	_i64toa_s(param.iValue, tmp, _countof(tmp), 10);
+	json.push_back(JSONNode(param.szName, tmp));
+	return json;
+}
+
+LIBJSON_DLL(JSONNode&) operator<<(JSONNode &json, const BOOL_PARAM &param)
+{
+	json.push_back(JSONNode(param.szName, param.bValue));
+	return json;
+}
+
+LIBJSON_DLL(JSONNode&) operator<<(JSONNode &json, const CHAR_PARAM &param)
+{
+	json.push_back(JSONNode(param.szName, param.szValue));
+	return json;
+}
+
+LIBJSON_DLL(JSONNode&) operator<<(JSONNode &json, const WCHAR_PARAM &param)
+{
+	json.push_back(JSONNode(param.szName, ptrA(mir_utf8encodeW(param.wszValue)).get()));
+	return json;
+}
diff --git a/libs/win32/libjson.lib b/libs/win32/libjson.lib
index 933a1a240e..7cef888308 100644
Binary files a/libs/win32/libjson.lib and b/libs/win32/libjson.lib differ
diff --git a/libs/win64/libjson.lib b/libs/win64/libjson.lib
index 840159782d..3db9115e65 100644
Binary files a/libs/win64/libjson.lib and b/libs/win64/libjson.lib differ
-- 
cgit v1.2.3