db_get_utfa supported in PROTO_INTERFACE & CMPlugin

6 files changed, 68 insertions, 4 deletions

diff --git a/include/m_protoint.h b/include/m_protoint.h
index 59b84ea8f5..887e195f09 100644
--- a/include/m_protoint.h
+++ b/include/m_protoint.h
@@ -118,20 +118,30 @@ public:
 		return db_get_dw(hContact, m_szModuleName, name, defaultValue); }

 

 	__forceinline INT_PTR getString(const char *name, DBVARIANT *result) {

-		return db_get_s(NULL, m_szModuleName, name, result); }

+		return db_get_s(NULL, m_szModuleName, name, result, DBVT_ASCIIZ); }

 	__forceinline INT_PTR getString(MCONTACT hContact, const char *name, DBVARIANT *result) {

-		return db_get_s(hContact, m_szModuleName, name, result); }

+		return db_get_s(hContact, m_szModuleName, name, result, DBVT_ASCIIZ); }

+

+	__forceinline INT_PTR getUString(const char *name, DBVARIANT *result) {

+		return db_get_s(NULL, m_szModuleName, name, result, DBVT_UTF8); }

+	__forceinline INT_PTR getUString(MCONTACT hContact, const char *name, DBVARIANT *result) {

+		return db_get_s(hContact, m_szModuleName, name, result, DBVT_UTF8); }

 

 	__forceinline INT_PTR getWString(const char *name, DBVARIANT *result) {

-		return db_get_ws(NULL, m_szModuleName, name, result); }

+		return db_get_s(NULL, m_szModuleName, name, result, DBVT_WCHAR); }

 	__forceinline INT_PTR getWString(MCONTACT hContact, const char *name, DBVARIANT *result) {

-		return db_get_ws(hContact, m_szModuleName, name, result); }

+		return db_get_s(hContact, m_szModuleName, name, result, DBVT_WCHAR); }

 

 	__forceinline char* getStringA(const char *name) {

 		return db_get_sa(NULL, m_szModuleName, name); }

 	__forceinline char* getStringA(MCONTACT hContact, const char *name) {

 		return db_get_sa(hContact, m_szModuleName, name); }

 

+	__forceinline char* getUStringA(const char *name) {

+		return db_get_utfa(NULL, m_szModuleName, name); }

+	__forceinline char* getUStringA(MCONTACT hContact, const char *name) {

+		return db_get_utfa(hContact, m_szModuleName, name); }

+

 	__forceinline wchar_t* getWStringA(const char *name) {

 		return db_get_wsa(NULL, m_szModuleName, name); }

 	__forceinline wchar_t* getWStringA(MCONTACT hContact, const char *name) {

@@ -159,6 +169,9 @@ public:
 	__forceinline void setString(const char *name, const char* value) { db_set_s(NULL, m_szModuleName, name, value); }

 	__forceinline void setString(MCONTACT hContact, const char *name, const char* value) { db_set_s(hContact, m_szModuleName, name, value); }

 

+	__forceinline void setStringU(const char *name, const char* value) { db_set_utf(NULL, m_szModuleName, name, value); }

+	__forceinline void setStringU(MCONTACT hContact, const char *name, const char* value) { db_set_utf(hContact, m_szModuleName, name, value); }

+

 	__forceinline void setWString(const char *name, const wchar_t* value) { db_set_ws(NULL, m_szModuleName, name, value); }

 	__forceinline void setWString(MCONTACT hContact, const char *name, const wchar_t* value) { db_set_ws(hContact, m_szModuleName, name, value); }

 

diff --git a/include/newpluginapi.h b/include/newpluginapi.h
index dccefbe944..d7c0370dd2 100644
--- a/include/newpluginapi.h
+++ b/include/newpluginapi.h
@@ -274,6 +274,15 @@ public:
 		return db_get_s(hContact, m_szModuleName, name, result);

 	}

 

+	__forceinline INT_PTR getUString(const char *name, DBVARIANT *result)

+	{

+		return db_get_utf(0, m_szModuleName, name, result);

+	}

+	__forceinline INT_PTR getUString(MCONTACT hContact, const char *name, DBVARIANT *result)

+	{

+		return db_get_utf(hContact, m_szModuleName, name, result);

+	}

+

 	__forceinline INT_PTR getWString(const char *name, DBVARIANT *result)

 	{

 		return db_get_ws(0, m_szModuleName, name, result);

@@ -301,6 +310,15 @@ public:
 		return db_get_sa(hContact, m_szModuleName, name);

 	}

 

+	__forceinline char* getUStringA(const char *name)

+	{

+		return db_get_utfa(0, m_szModuleName, name);

+	}

+	__forceinline char* getUStringA(MCONTACT hContact, const char *name)

+	{

+		return db_get_utfa(hContact, m_szModuleName, name);

+	}

+

 	__forceinline wchar_t* getWStringA(const char *name)

 	{

 		return db_get_wsa(0, m_szModuleName, name);

@@ -355,6 +373,15 @@ public:
 		db_set_s(hContact, m_szModuleName, name, value);

 	}

 

+	__forceinline void setUString(const char *name, const char* value)

+	{

+		db_set_utf(0, m_szModuleName, name, value);

+	}

+	__forceinline void setUString(MCONTACT hContact, const char *name, const char* value)

+	{

+		db_set_utf(hContact, m_szModuleName, name, value);

+	}

+

 	__forceinline void setWString(const char *name, const wchar_t* value)

 	{

 		db_set_ws(0, m_szModuleName, name, value);

diff --git a/libs/win32/mir_app.lib b/libs/win32/mir_app.lib
index 28e4c72745..5fdf7107c2 100644
--- a/libs/win32/mir_app.lib
+++ b/libs/win32/mir_app.lib
diff --git a/libs/win64/mir_app.lib b/libs/win64/mir_app.lib
index 4029ac213a..b14ac154ca 100644
--- a/libs/win64/mir_app.lib
+++ b/libs/win64/mir_app.lib
diff --git a/src/mir_app/src/mir_app.def b/src/mir_app/src/mir_app.def
index 014d6e4a31..5ba621a7e7 100644
--- a/src/mir_app/src/mir_app.def
+++ b/src/mir_app/src/mir_app.def
@@ -640,3 +640,15 @@ db_mc_removeFromMeta @729
 db_mc_setDefault @730

 db_mc_setDefaultNum @731

 db_mc_tryMeta @732

+?getUString@CMPluginBase@@QAEHIPBDPAUDBVARIANT@@@Z @733 NONAME

+?getUString@CMPluginBase@@QAEHPBDPAUDBVARIANT@@@Z @734 NONAME

+?getUString@PROTO_INTERFACE@@QAEHIPBDPAUDBVARIANT@@@Z @735 NONAME

+?getUString@PROTO_INTERFACE@@QAEHPBDPAUDBVARIANT@@@Z @736 NONAME

+?getUStringA@CMPluginBase@@QAEPADIPBD@Z @737 NONAME

+?getUStringA@CMPluginBase@@QAEPADPBD@Z @738 NONAME

+?getUStringA@PROTO_INTERFACE@@QAEPADIPBD@Z @739 NONAME

+?getUStringA@PROTO_INTERFACE@@QAEPADPBD@Z @740 NONAME

+?setStringU@PROTO_INTERFACE@@QAEXIPBD0@Z @741 NONAME

+?setStringU@PROTO_INTERFACE@@QAEXPBD0@Z @742 NONAME

+?setUString@CMPluginBase@@QAEXIPBD0@Z @743 NONAME

+?setUString@CMPluginBase@@QAEXPBD0@Z @744 NONAME

diff --git a/src/mir_app/src/mir_app64.def b/src/mir_app/src/mir_app64.def
index 76829f592e..245856ae0c 100644
--- a/src/mir_app/src/mir_app64.def
+++ b/src/mir_app/src/mir_app64.def
@@ -640,3 +640,15 @@ db_mc_removeFromMeta @729
 db_mc_setDefault @730

 db_mc_setDefaultNum @731

 db_mc_tryMeta @732

+?getUString@CMPluginBase@@QEAA_JIPEBDPEAUDBVARIANT@@@Z @733 NONAME

+?getUString@CMPluginBase@@QEAA_JPEBDPEAUDBVARIANT@@@Z @734 NONAME

+?getUString@PROTO_INTERFACE@@QEAA_JIPEBDPEAUDBVARIANT@@@Z @735 NONAME

+?getUString@PROTO_INTERFACE@@QEAA_JPEBDPEAUDBVARIANT@@@Z @736 NONAME

+?getUStringA@CMPluginBase@@QEAAPEADIPEBD@Z @737 NONAME

+?getUStringA@CMPluginBase@@QEAAPEADPEBD@Z @738 NONAME

+?getUStringA@PROTO_INTERFACE@@QEAAPEADIPEBD@Z @739 NONAME

+?getUStringA@PROTO_INTERFACE@@QEAAPEADPEBD@Z @740 NONAME

+?setStringU@PROTO_INTERFACE@@QEAAXIPEBD0@Z @741 NONAME

+?setStringU@PROTO_INTERFACE@@QEAAXPEBD0@Z @742 NONAME

+?setUString@CMPluginBase@@QEAAXIPEBD0@Z @743 NONAME

+?setUString@CMPluginBase@@QEAAXPEBD0@Z @744 NONAME