From 01b51542b22ea4c36001324b6014e3f7667c0981 Mon Sep 17 00:00:00 2001
From: George Hazan <ghazan@miranda.im>
Date: Thu, 23 Nov 2017 21:08:39 +0300
Subject: common database code to be concentrated in mir_app

---
 plugins/Db3x_mmap/src/dbsettings.cpp | 163 +----------------------------------
 1 file changed, 1 insertion(+), 162 deletions(-)

(limited to 'plugins/Db3x_mmap/src/dbsettings.cpp')

diff --git a/plugins/Db3x_mmap/src/dbsettings.cpp b/plugins/Db3x_mmap/src/dbsettings.cpp
index 8fd9a1dde3..3f22540b21 100644
--- a/plugins/Db3x_mmap/src/dbsettings.cpp
+++ b/plugins/Db3x_mmap/src/dbsettings.cpp
@@ -63,18 +63,8 @@ int CDb3Mmap::GetContactSettingWorker(MCONTACT contactID, LPCSTR szModule, LPCST
 	// the db format can't tolerate more than 255 bytes of space (incl. null) for settings+module name
 	int settingNameLen = (int)mir_strlen(szSetting);
 	int moduleNameLen = (int)mir_strlen(szModule);
-	if (settingNameLen > 0xFE) {
-#ifdef _DEBUG
-		OutputDebugStringA("GetContactSettingWorker() got a > 255 setting name length. \n");
-#endif
-		return 1;
-	}
-	if (moduleNameLen > 0xFE) {
-#ifdef _DEBUG
-		OutputDebugStringA("GetContactSettingWorker() got a > 255 module name length. \n");
-#endif
+	if (settingNameLen > 0xFE || moduleNameLen > 0xFE)
 		return 1;
-	}
 
 	mir_cslock lck(m_csDbAccess);
 
@@ -246,157 +236,6 @@ LBL_Seek:
 	return 1;
 }
 
-STDMETHODIMP_(BOOL) CDb3Mmap::GetContactSetting(MCONTACT contactID, LPCSTR szModule, LPCSTR szSetting, DBVARIANT *dbv)
-{
-	dbv->type = 0;
-	if (GetContactSettingWorker(contactID, szModule, szSetting, dbv, 0))
-		return 1;
-
-	if (dbv->type == DBVT_UTF8) {
-		WCHAR *tmp = nullptr;
-		char *p = NEWSTR_ALLOCA(dbv->pszVal);
-		if (mir_utf8decode(p, &tmp) != nullptr) {
-			BOOL bUsed = FALSE;
-			int  result = WideCharToMultiByte(m_codePage, WC_NO_BEST_FIT_CHARS, tmp, -1, nullptr, 0, nullptr, &bUsed);
-
-			mir_free(dbv->pszVal);
-
-			if (bUsed || result == 0) {
-				dbv->type = DBVT_WCHAR;
-				dbv->pwszVal = tmp;
-			}
-			else {
-				dbv->type = DBVT_ASCIIZ;
-				dbv->pszVal = (char *)mir_alloc(result);
-				WideCharToMultiByte(m_codePage, WC_NO_BEST_FIT_CHARS, tmp, -1, dbv->pszVal, result, nullptr, nullptr);
-				mir_free(tmp);
-			}
-		}
-		else {
-			dbv->type = DBVT_ASCIIZ;
-			mir_free(tmp);
-		}
-	}
-
-	return 0;
-}
-
-STDMETHODIMP_(BOOL) CDb3Mmap::GetContactSettingStr(MCONTACT contactID, LPCSTR szModule, LPCSTR szSetting, DBVARIANT *dbv)
-{
-	int iSaveType = dbv->type;
-
-	if (GetContactSettingWorker(contactID, szModule, szSetting, dbv, 0))
-		return 1;
-
-	if (iSaveType == 0 || iSaveType == dbv->type)
-		return 0;
-
-	if (dbv->type != DBVT_ASCIIZ && dbv->type != DBVT_UTF8)
-		return 1;
-
-	if (iSaveType == DBVT_WCHAR) {
-		if (dbv->type != DBVT_UTF8) {
-			int len = MultiByteToWideChar(CP_ACP, 0, dbv->pszVal, -1, nullptr, 0);
-			wchar_t* wszResult = (wchar_t*)mir_alloc((len + 1)*sizeof(wchar_t));
-			if (wszResult == nullptr)
-				return 1;
-
-			MultiByteToWideChar(CP_ACP, 0, dbv->pszVal, -1, wszResult, len);
-			wszResult[len] = 0;
-			mir_free(dbv->pszVal);
-			dbv->pwszVal = wszResult;
-		}
-		else {
-			char* savePtr = NEWSTR_ALLOCA(dbv->pszVal);
-			mir_free(dbv->pszVal);
-			if (!mir_utf8decode(savePtr, &dbv->pwszVal))
-				return 1;
-		}
-	}
-	else if (iSaveType == DBVT_UTF8) {
-		char* tmpBuf = mir_utf8encode(dbv->pszVal);
-		if (tmpBuf == nullptr)
-			return 1;
-
-		mir_free(dbv->pszVal);
-		dbv->pszVal = tmpBuf;
-	}
-	else if (iSaveType == DBVT_ASCIIZ)
-		mir_utf8decode(dbv->pszVal, nullptr);
-
-	dbv->type = iSaveType;
-	return 0;
-}
-
-STDMETHODIMP_(BOOL) CDb3Mmap::GetContactSettingStatic(MCONTACT contactID, LPCSTR szModule, LPCSTR szSetting, DBVARIANT *dbv)
-{
-	bool bNeedsWchars;
-	size_t cbSaved;
-
-	if (dbv->type == DBVT_WCHAR) { // there's no wchar_t strings in a database, we need conversion
-		cbSaved = dbv->cchVal-1;
-		dbv->cchVal *= sizeof(wchar_t); // extend a room for the utf8 string
-		dbv->type = DBVT_UTF8;
-		bNeedsWchars = true;
-	}
-	else bNeedsWchars = false;
-
-	if (GetContactSettingWorker(contactID, szModule, szSetting, dbv, 1))
-		return 1;
-
-	if (bNeedsWchars) {
-		char *pBuf = NEWSTR_ALLOCA(dbv->pszVal);
-		int cbLen = Utf8toUcs2(pBuf, dbv->cchVal, dbv->pwszVal, cbSaved);
-		if (cbLen < 0)
-			return 1;
-		
-		dbv->pwszVal[cbLen] = 0;
-	}
-	else if (dbv->type == DBVT_UTF8) {
-		mir_utf8decode(dbv->pszVal, nullptr);
-		dbv->type = DBVT_ASCIIZ;
-	}
-
-	return 0;
-}
-
-STDMETHODIMP_(BOOL) CDb3Mmap::FreeVariant(DBVARIANT *dbv)
-{
-	if (dbv == nullptr) return 1;
-
-	switch (dbv->type) {
-	case DBVT_ASCIIZ:
-	case DBVT_UTF8:
-	case DBVT_WCHAR:
-		if (dbv->pszVal) mir_free(dbv->pszVal);
-		dbv->pszVal = nullptr;
-		break;
-	case DBVT_BLOB:
-		if (dbv->pbVal) mir_free(dbv->pbVal);
-		dbv->pbVal = nullptr;
-		break;
-	}
-	dbv->type = 0;
-	return 0;
-}
-
-STDMETHODIMP_(BOOL) CDb3Mmap::SetSettingResident(BOOL bIsResident, const char *pszSettingName)
-{
-	char *szSetting = m_cache->GetCachedSetting(nullptr, pszSettingName, 0, (int)mir_strlen(pszSettingName));
-	szSetting[-1] = (char)bIsResident;
-
-	mir_cslock lck(m_csDbAccess);
-	int idx = m_lResidentSettings.getIndex(szSetting);
-	if (idx == -1) {
-		if (bIsResident)
-			m_lResidentSettings.insert(szSetting);
-	}
-	else if (!bIsResident)
-		m_lResidentSettings.remove(idx);
-
-	return 0;
-}
-
 STDMETHODIMP_(BOOL) CDb3Mmap::WriteContactSetting(MCONTACT contactID, DBCONTACTWRITESETTING *dbcws)
 {
 	if (dbcws == nullptr || dbcws->szSetting == nullptr || dbcws->szModule == nullptr || m_bReadOnly)
-- 
cgit v1.2.3