From ec60bf5b0f03bfb4c310957e5eec9c17193c6c15 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sun, 15 Mar 2020 16:02:06 +0300 Subject: db_get_sm / getStringA / getWStringA / getUStringA/ getMStringA / getMStringW - missing szValue parameter added --- include/m_database.h | 4 ++-- include/m_protoint.h | 46 +++++++++++++++++++++++----------------------- include/newpluginapi.h | 40 ++++++++++++++++++++-------------------- 3 files changed, 45 insertions(+), 45 deletions(-) (limited to 'include') diff --git a/include/m_database.h b/include/m_database.h index 094a0c57fa..0988d2a483 100644 --- a/include/m_database.h +++ b/include/m_database.h @@ -388,8 +388,8 @@ EXTERN_C MIR_CORE_DLL(char*) db_get_sa(MCONTACT hContact, const char *szModul EXTERN_C MIR_CORE_DLL(char*) db_get_utfa(MCONTACT hContact, const char *szModule, const char *szSetting, const char *szValue = nullptr); EXTERN_C MIR_CORE_DLL(wchar_t*) db_get_wsa(MCONTACT hContact, const char *szModule, const char *szSetting, const wchar_t *szValue = nullptr); -MIR_CORE_DLL(CMStringA) db_get_sm(MCONTACT hContact, const char *szModule, const char *szSetting); -MIR_CORE_DLL(CMStringW) db_get_wsm(MCONTACT hContact, const char *szModule, const char *szSetting); +MIR_CORE_DLL(CMStringA) db_get_sm(MCONTACT hContact, const char *szModule, const char *szSetting, const char *szValue = nullptr); +MIR_CORE_DLL(CMStringW) db_get_wsm(MCONTACT hContact, const char *szModule, const char *szSetting, const wchar_t *szValue = nullptr); EXTERN_C MIR_CORE_DLL(int) db_get_static(MCONTACT hContact, const char *szModule, const char *szSetting, char *pDest, int cbDest); EXTERN_C MIR_CORE_DLL(int) db_get_static_utf(MCONTACT hContact, const char *szModule, const char *szSetting, char *pDest, int cbDest); diff --git a/include/m_protoint.h b/include/m_protoint.h index 8eb162d807..ce815c6e97 100644 --- a/include/m_protoint.h +++ b/include/m_protoint.h @@ -134,30 +134,30 @@ public: __forceinline INT_PTR getWString(MCONTACT hContact, const char *name, DBVARIANT *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) { - 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 char* getStringA(const char *name, const char *szValue = nullptr) { + return db_get_sa(NULL, m_szModuleName, name, szValue); } + __forceinline char* getStringA(MCONTACT hContact, const char *name, const char *szValue = nullptr) { + return db_get_sa(hContact, m_szModuleName, name, szValue); } + + __forceinline char* getUStringA(const char *name, const char *szValue = nullptr) { + return db_get_utfa(NULL, m_szModuleName, name, szValue); } + __forceinline char* getUStringA(MCONTACT hContact, const char *name, const char *szValue = nullptr) { + return db_get_utfa(hContact, m_szModuleName, name, szValue); } + + __forceinline wchar_t* getWStringA(const char *name, const wchar_t *szValue = nullptr) { + return db_get_wsa(NULL, m_szModuleName, name, szValue); } + __forceinline wchar_t* getWStringA(MCONTACT hContact, const char *name, const wchar_t *szValue = nullptr) { + return db_get_wsa(hContact, m_szModuleName, name, szValue); } + + __forceinline CMStringA getMStringA(const char *name, const char *szValue = nullptr) { + return db_get_sm(NULL, m_szModuleName, name, szValue); } + __forceinline CMStringA getMStringA(MCONTACT hContact, const char *name, const char *szValue = nullptr) { + return db_get_sm(hContact, m_szModuleName, name, szValue); } - __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 CMStringW getMStringW(const char *name, const wchar_t *szValue = nullptr) { + return db_get_wsm(NULL, m_szModuleName, name, szValue); } + __forceinline CMStringW getMStringW(MCONTACT hContact, const char *name, const wchar_t *szValue = nullptr) { + return db_get_wsm(hContact, m_szModuleName, name, szValue); } __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 ddbad6005a..a92164f2fe 100644 --- a/include/newpluginapi.h +++ b/include/newpluginapi.h @@ -306,49 +306,49 @@ public: return db_get_ws(hContact, m_szModuleName, name, result); } - __forceinline CMStringA getMStringA(const char *name) + __forceinline CMStringA getMStringA(const char *name, const char *szValue = nullptr) { - return db_get_sm(0, m_szModuleName, name); + return db_get_sm(0, m_szModuleName, name, szValue); } - __forceinline CMStringA getMStringA(MCONTACT hContact, const char *name) + __forceinline CMStringA getMStringA(MCONTACT hContact, const char *name, const char *szValue = nullptr) { - return db_get_sm(hContact, m_szModuleName, name); + return db_get_sm(hContact, m_szModuleName, name, szValue); } - __forceinline char* getStringA(const char *name) + __forceinline char* getStringA(const char *name, const char *szValue = nullptr) { - return db_get_sa(0, m_szModuleName, name); + return db_get_sa(0, m_szModuleName, name, szValue); } - __forceinline char* getStringA(MCONTACT hContact, const char *name) + __forceinline char* getStringA(MCONTACT hContact, const char *name, const char *szValue = nullptr) { - return db_get_sa(hContact, m_szModuleName, name); + return db_get_sa(hContact, m_szModuleName, name, szValue); } - __forceinline char* getUStringA(const char *name) + __forceinline char* getUStringA(const char *name, const char *szValue = nullptr) { - return db_get_utfa(0, m_szModuleName, name); + return db_get_utfa(0, m_szModuleName, name, szValue); } - __forceinline char* getUStringA(MCONTACT hContact, const char *name) + __forceinline char* getUStringA(MCONTACT hContact, const char *name, const char *szValue = nullptr) { - return db_get_utfa(hContact, m_szModuleName, name); + return db_get_utfa(hContact, m_szModuleName, name, szValue); } - __forceinline wchar_t* getWStringA(const char *name) + __forceinline wchar_t* getWStringA(const char *name, const wchar_t *szValue = nullptr) { - return db_get_wsa(0, m_szModuleName, name); + return db_get_wsa(0, m_szModuleName, name, szValue); } - __forceinline wchar_t* getWStringA(MCONTACT hContact, const char *name) + __forceinline wchar_t* getWStringA(MCONTACT hContact, const char *name, const wchar_t *szValue = nullptr) { - return db_get_wsa(hContact, m_szModuleName, name); + return db_get_wsa(hContact, m_szModuleName, name, szValue); } - __forceinline CMStringW getMStringW(const char *name) + __forceinline CMStringW getMStringW(const char *name, const wchar_t *szValue = nullptr) { - return db_get_wsm(0, m_szModuleName, name); + return db_get_wsm(0, m_szModuleName, name, szValue); } - __forceinline CMStringW getMStringW(MCONTACT hContact, const char *name) + __forceinline CMStringW getMStringW(MCONTACT hContact, const char *name, const wchar_t *szValue = nullptr) { - return db_get_wsm(hContact, m_szModuleName, name); + return db_get_wsm(hContact, m_szModuleName, name, szValue); } __forceinline void setByte(const char *name, BYTE value) -- cgit v1.2.3