From 6b91af6235cbd8643c7c63e07ceb23f1b13e8a8f Mon Sep 17 00:00:00 2001 From: George Hazan Date: Fri, 27 Apr 2018 14:11:18 +0200 Subject: implementation of #1308 --- include/m_database.h | 4 ++++ include/m_protoint.h | 10 ++++++++++ include/newpluginapi.h | 18 ++++++++++++++++++ 3 files changed, 32 insertions(+) (limited to 'include') diff --git a/include/m_database.h b/include/m_database.h index c7e68e0d50..651a0a3b0a 100644 --- a/include/m_database.h +++ b/include/m_database.h @@ -400,9 +400,13 @@ EXTERN_C MIR_CORE_DLL(INT_PTR) db_get(MCONTACT hContact, LPCSTR szModule, LPCST EXTERN_C MIR_CORE_DLL(int) db_get_b(MCONTACT hContact, LPCSTR szModule, LPCSTR szSetting, int errorValue = 0); EXTERN_C MIR_CORE_DLL(int) db_get_w(MCONTACT hContact, LPCSTR szModule, LPCSTR szSetting, int errorValue = 0); EXTERN_C MIR_CORE_DLL(DWORD) db_get_dw(MCONTACT hContact, LPCSTR szModule, LPCSTR szSetting, DWORD errorValue = 0); + EXTERN_C MIR_CORE_DLL(char*) db_get_sa(MCONTACT hContact, LPCSTR szModule, LPCSTR szSetting); EXTERN_C MIR_CORE_DLL(wchar_t*) db_get_wsa(MCONTACT hContact, LPCSTR szModule, LPCSTR szSetting); +MIR_CORE_DLL(CMStringA) db_get_sm(MCONTACT hContact, LPCSTR szModule, LPCSTR szSetting); +MIR_CORE_DLL(CMStringW) db_get_wsm(MCONTACT hContact, LPCSTR szModule, LPCSTR szSetting); + EXTERN_C MIR_CORE_DLL(int) db_get_static(MCONTACT hContact, LPCSTR szModule, LPCSTR szSetting, char *pDest, int cbDest); EXTERN_C MIR_CORE_DLL(int) db_get_static_utf(MCONTACT hContact, LPCSTR szModule, LPCSTR szSetting, char *pDest, int cbDest); EXTERN_C MIR_CORE_DLL(int) db_get_wstatic(MCONTACT hContact, LPCSTR szModule, LPCSTR szSetting, wchar_t *pDest, int cbDest); diff --git a/include/m_protoint.h b/include/m_protoint.h index f7d9d15968..f32b07983b 100644 --- a/include/m_protoint.h +++ b/include/m_protoint.h @@ -137,6 +137,16 @@ public: __forceinline wchar_t* getWStringA(MCONTACT hContact, const char *name) { return db_get_wsa(hContact, m_szModuleName, name); } + __forceinline CMStringA getMStringA(const char *name) { + return db_get_sm(NULL, m_szModuleName, name); } + __forceinline CMStringA getMStringA(MCONTACT hContact, const char *name) { + return db_get_sm(hContact, m_szModuleName, name); } + + __forceinline CMStringW getMStringW(const char *name) { + return db_get_wsm(NULL, m_szModuleName, name); } + __forceinline CMStringW getMStringW(MCONTACT hContact, const char *name) { + return db_get_wsm(hContact, m_szModuleName, name); } + __forceinline void setByte(const char *name, BYTE value) { db_set_b(NULL, m_szModuleName, name, value); } __forceinline void setByte(MCONTACT hContact, const char *name, BYTE value) { db_set_b(hContact, m_szModuleName, name, value); } diff --git a/include/newpluginapi.h b/include/newpluginapi.h index 85d0b94007..fc1344030c 100644 --- a/include/newpluginapi.h +++ b/include/newpluginapi.h @@ -238,6 +238,15 @@ public: return db_get_ws(hContact, m_szModuleName, name, result); } + __forceinline CMStringA getMStringA(const char *name) + { + return db_get_sm(0, m_szModuleName, name); + } + __forceinline CMStringA getMStringA(MCONTACT hContact, const char *name) + { + return db_get_sm(hContact, m_szModuleName, name); + } + __forceinline char* getStringA(const char *name) { return db_get_sa(0, m_szModuleName, name); @@ -256,6 +265,15 @@ public: return db_get_wsa(hContact, m_szModuleName, name); } + __forceinline CMStringW getMStringW(const char *name) + { + return db_get_wsm(0, m_szModuleName, name); + } + __forceinline CMStringW getMStringW(MCONTACT hContact, const char *name) + { + return db_get_wsm(hContact, m_szModuleName, name); + } + __forceinline void setByte(const char *name, BYTE value) { db_set_b(0, m_szModuleName, name, value); -- cgit v1.2.3