- new helpers for reading db strings into static buffers;

- MS_DB_CONTACT_GETSETTINGSTATIC died;
- DBCONTACTGETSETTING is detouched from all services;
- these service calls are rewritten using parameters

git-svn-id: http://svn.miranda-ng.org/main/trunk@8035 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

3 files changed, 3 insertions, 13 deletions

diff --git a/src/modules/clist/contacts.cpp b/src/modules/clist/contacts.cpp
index 77e3145a0d..9385b2dc5e 100644
--- a/src/modules/clist/contacts.cpp
+++ b/src/modules/clist/contacts.cpp
@@ -47,7 +47,8 @@ static int GetDatabaseString(CONTACTINFO *ci, const char* setting, DBVARIANT* db
 		dbv->type = (ci->dwFlag & CNF_UNICODE) ? DBVT_WCHAR : DBVT_ASCIIZ;

 

 		int res = CallProtoService(ci->szProto, PS_GETINFOSETTING, (WPARAM)ci->hContact, (LPARAM)&cgs);

-		if (res != CALLSERVICE_NOTFOUND) return res;

+		if (res != CALLSERVICE_NOTFOUND)

+			return res;

 	}

 

 	if (ci->dwFlag & CNF_UNICODE)

diff --git a/src/modules/database/dbintf.cpp b/src/modules/database/dbintf.cpp
index 14e02c7430..a03ac5b97c 100644
--- a/src/modules/database/dbintf.cpp
+++ b/src/modules/database/dbintf.cpp
@@ -76,11 +76,6 @@ static INT_PTR srvEnumModuleNames(WPARAM wParam,LPARAM lParam)
 ///////////////////////////////////////////////////////////////////////////////

 // Settings

 

-static INT_PTR srvGetContactSettingStatic(WPARAM wParam,LPARAM lParam)

-{

-	return (currDb) ? (INT_PTR)currDb->GetContactSettingStatic((HANDLE)wParam, (DBCONTACTGETSETTING*)lParam) : 0;

-}

-

 static INT_PTR srvEnumContactSettings(WPARAM wParam,LPARAM lParam)

 {

 	return (currDb) ? (INT_PTR)currDb->EnumContactSettings((HANDLE)wParam, (DBCONTACTENUMSETTINGS*)lParam) : 0;

@@ -152,7 +147,6 @@ int LoadDbintfModule()
 

 	CreateServiceFunction(MS_DB_MODULES_ENUM, srvEnumModuleNames);

 

-	CreateServiceFunction(MS_DB_CONTACT_GETSETTINGSTATIC, srvGetContactSettingStatic);

 	CreateServiceFunction(MS_DB_CONTACT_ENUMSETTINGS, srvEnumContactSettings);

 	CreateServiceFunction("DB/ResidentSettings/Enum", srvEnumResidentSettings);

 

diff --git a/src/modules/protocols/protochains.cpp b/src/modules/protocols/protochains.cpp
index 56080253dc..3841d1842f 100644
--- a/src/modules/protocols/protochains.cpp
+++ b/src/modules/protocols/protochains.cpp
@@ -44,12 +44,7 @@ static int GetProtocolP(HANDLE hContact, char *szBuf, int cbLen)
 	dbv.pszVal = szBuf;

 	dbv.cchVal = cbLen;

 

-	DBCONTACTGETSETTING dbcgs;

-	dbcgs.pValue = &dbv;

-	dbcgs.szModule = "Protocol";

-	dbcgs.szSetting = "p";

-

-	int res = currDb->GetContactSettingStatic(hContact, &dbcgs);

+	int res = currDb->GetContactSettingStatic(hContact, "Protocol", "p", &dbv);

 	if (res == 0) {

 		if (cc == NULL)

 			cc = currDb->m_cache->AddContactToCache(hContact);