database enumerators => void* instead of LPARAM

4 files changed, 11 insertions, 11 deletions

diff --git a/plugins/Db3x_mmap/src/dbcrypt.cpp b/plugins/Db3x_mmap/src/dbcrypt.cpp
index 03c6da8385..d2368e5b68 100644
--- a/plugins/Db3x_mmap/src/dbcrypt.cpp
+++ b/plugins/Db3x_mmap/src/dbcrypt.cpp
@@ -69,7 +69,7 @@ struct SettingUgraderParam
 	OBJLIST<VarDescr>* pList;

 };

 

-int sttSettingUgrader(const char *szSetting, LPARAM lParam)

+int sttSettingUgrader(const char *szSetting, void *lParam)

 {

 	SettingUgraderParam *param = (SettingUgraderParam*)lParam;

 	if (param->db->IsSettingEncrypted(param->szModule, szSetting)) {

@@ -108,7 +108,7 @@ void sttContactEnum(MCONTACT contactID, const char *szModule, CDb3Mmap *db)
 	}

 }

 

-int sttModuleEnum(const char *szModule, DWORD, LPARAM lParam)

+int sttModuleEnum(const char *szModule, void *lParam)

 {

 	CDb3Mmap *db = (CDb3Mmap*)lParam;

 	sttContactEnum(0, szModule, db);

diff --git a/plugins/Db3x_mmap/src/dbintf.h b/plugins/Db3x_mmap/src/dbintf.h
index 8155a1758f..1a6024bb20 100644
--- a/plugins/Db3x_mmap/src/dbintf.h
+++ b/plugins/Db3x_mmap/src/dbintf.h
@@ -232,13 +232,13 @@ public:
 	STDMETHODIMP_(MEVENT)   FindNextEvent(MCONTACT contactID, MEVENT hDbEvent);

 	STDMETHODIMP_(MEVENT)   FindPrevEvent(MCONTACT contactID, MEVENT hDbEvent);

 

-	STDMETHODIMP_(BOOL)     EnumModuleNames(DBMODULEENUMPROC pFunc, const void *pParam);

+	STDMETHODIMP_(BOOL)     EnumModuleNames(DBMODULEENUMPROC pFunc, void *pParam);

 

 	STDMETHODIMP_(BOOL)     GetContactSettingWorker(MCONTACT contactID, LPCSTR szModule, LPCSTR szSetting, DBVARIANT *dbv, int isStatic);

 	STDMETHODIMP_(BOOL)     WriteContactSetting(MCONTACT contactID, DBCONTACTWRITESETTING *dbcws);

 	STDMETHODIMP_(BOOL)     DeleteContactSetting(MCONTACT contactID, LPCSTR szModule, LPCSTR szSetting);

-	STDMETHODIMP_(BOOL)     EnumContactSettings(MCONTACT hContact, DBSETTINGENUMPROC pfnEnumProc, const char *szModule, const void *param);

-	STDMETHODIMP_(BOOL)     EnumResidentSettings(DBMODULEENUMPROC pFunc, const void *pParam);

+	STDMETHODIMP_(BOOL)     EnumContactSettings(MCONTACT hContact, DBSETTINGENUMPROC pfnEnumProc, const char *szModule, void *param);

+	STDMETHODIMP_(BOOL)     EnumResidentSettings(DBMODULEENUMPROC pFunc, void *pParam);

 	STDMETHODIMP_(BOOL)     IsSettingEncrypted(LPCSTR szModule, LPCSTR szSetting);

 

 	STDMETHODIMP_(BOOL)     MetaDetouchSub(DBCachedContact *cc, int nSub);

diff --git a/plugins/Db3x_mmap/src/dbmodulechain.cpp b/plugins/Db3x_mmap/src/dbmodulechain.cpp
index 47d1cf40d3..3c2fb36f13 100644
--- a/plugins/Db3x_mmap/src/dbmodulechain.cpp
+++ b/plugins/Db3x_mmap/src/dbmodulechain.cpp
@@ -127,11 +127,11 @@ char* CDb3Mmap::GetModuleNameByOfs(DWORD ofs)
 	return nullptr;

 }

 

-STDMETHODIMP_(BOOL) CDb3Mmap::EnumModuleNames(DBMODULEENUMPROC pFunc, const void *pParam)

+STDMETHODIMP_(BOOL) CDb3Mmap::EnumModuleNames(DBMODULEENUMPROC pFunc, void *pParam)

 {

 	for (int i = 0; i < m_lMods.getCount(); i++) {

 		ModuleName *pmn = m_lMods[i];

-		int ret = pFunc(pmn->name, pmn->ofs, (LPARAM)pParam);

+		int ret = pFunc(pmn->name, pParam);

 		if (ret)

 			return ret;

 	}

diff --git a/plugins/Db3x_mmap/src/dbsettings.cpp b/plugins/Db3x_mmap/src/dbsettings.cpp
index 3f22540b21..76225aec4c 100644
--- a/plugins/Db3x_mmap/src/dbsettings.cpp
+++ b/plugins/Db3x_mmap/src/dbsettings.cpp
@@ -648,7 +648,7 @@ STDMETHODIMP_(BOOL) CDb3Mmap::DeleteContactSetting(MCONTACT contactID, LPCSTR sz
 	return 0;

 }

 

-STDMETHODIMP_(BOOL) CDb3Mmap::EnumContactSettings(MCONTACT contactID, DBSETTINGENUMPROC pfnEnumProc, const char *szModule, const void *param)

+STDMETHODIMP_(BOOL) CDb3Mmap::EnumContactSettings(MCONTACT contactID, DBSETTINGENUMPROC pfnEnumProc, const char *szModule, void *param)

 {

 	if (!szModule)

 		return -1;

@@ -680,7 +680,7 @@ STDMETHODIMP_(BOOL) CDb3Mmap::EnumContactSettings(MCONTACT contactID, DBSETTINGE
 		NeedBytes(1 + pBlob[0]);

 		char szSetting[256];

 		memcpy(szSetting, pBlob + 1, pBlob[0]); szSetting[pBlob[0]] = 0;

-		result = pfnEnumProc(szSetting, LPARAM(param));

+		result = pfnEnumProc(szSetting, param);

 		MoveAlong(1 + pBlob[0]);

 		NeedBytes(3);

 		MoveAlong(1 + GetSettingValueLength(pBlob));

@@ -689,10 +689,10 @@ STDMETHODIMP_(BOOL) CDb3Mmap::EnumContactSettings(MCONTACT contactID, DBSETTINGE
 	return result;

 }

 

-STDMETHODIMP_(BOOL) CDb3Mmap::EnumResidentSettings(DBMODULEENUMPROC pFunc, const void *pParam)

+STDMETHODIMP_(BOOL) CDb3Mmap::EnumResidentSettings(DBMODULEENUMPROC pFunc, void *pParam)

 {

 	for (int i = 0; i < m_lResidentSettings.getCount(); i++) {

-		int ret = pFunc(m_lResidentSettings[i], 0, (LPARAM)pParam);

+		int ret = pFunc(m_lResidentSettings[i], pParam);

 		if (ret)

 			return ret;

 	}