db_get_utfa supported in PROTO_INTERFACE & CMPlugin

2 files changed, 44 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);