databases are still static, but are controlled via classes

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

14 files changed, 634 insertions, 777 deletions

diff --git a/plugins/Db3x_mmap/commonheaders.h b/plugins/Db3x_mmap/commonheaders.h
index dd796f9b48..7dc31a1615 100644
--- a/plugins/Db3x_mmap/commonheaders.h
+++ b/plugins/Db3x_mmap/commonheaders.h
@@ -44,18 +44,16 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <newpluginapi.h>

 #include <win2k.h>

 #include <m_system.h>

+#include <m_system_cpp.h>

 #include <m_database.h>

 #include <m_langpack.h>

 #include <m_utils.h>

 

 #include "database.h"

+#include "dbintf.h"

 #include "resource.h"

 #include "version.h"

 

-extern CRITICAL_SECTION csDbAccess;

-extern struct DBHeader dbHeader;

-extern HANDLE hDbFile;

-

 #ifdef __GNUC__

 #define mir_i64(x) (x##LL)

 #else

diff --git a/plugins/Db3x_mmap/database.cpp b/plugins/Db3x_mmap/database.cpp
index 0e8f45cc24..a69c902772 100644
--- a/plugins/Db3x_mmap/database.cpp
+++ b/plugins/Db3x_mmap/database.cpp
@@ -29,10 +29,7 @@ int InitialiseDbHeaders(void);
 int InitSettings(void);

 void UninitSettings(void);

 int InitContacts(void);

-void UninitContacts(void);

 int InitEvents(void);

-void UninitEvents(void);

-int InitCrypt(void);

 int InitModuleNames(void);

 void UninitModuleNames(void);

 int InitCache(void);

@@ -40,10 +37,10 @@ void UninitCache(void);
 int InitIni(void);

 void UninitIni(void);

 

-HANDLE hDbFile=INVALID_HANDLE_VALUE;

+HANDLE hDbFile = INVALID_HANDLE_VALUE;

 CRITICAL_SECTION csDbAccess;

 struct DBHeader dbHeader;

-char szDbPath[MAX_PATH];

+TCHAR szDbPath[MAX_PATH];

 

 static void UnloadDatabase(void)

 {

@@ -58,8 +55,8 @@ static void UnloadDatabase(void)
 DWORD CreateNewSpace(int bytes)

 {

 	DWORD ofsNew;

-	ofsNew=dbHeader.ofsFileEnd;

-	dbHeader.ofsFileEnd+=bytes;

+	ofsNew = dbHeader.ofsFileEnd;

+	dbHeader.ofsFileEnd += bytes;

 	DBWrite(0,&dbHeader,sizeof(dbHeader));

 	log2("newspace %d@%08x",bytes,ofsNew);

 	return ofsNew;

@@ -69,10 +66,10 @@ void DeleteSpace(DWORD ofs,int bytes)
 {

 	if (ofs+bytes == dbHeader.ofsFileEnd)	{

 		log2("freespace %d@%08x",bytes,ofs);

-		dbHeader.ofsFileEnd=ofs;

+		dbHeader.ofsFileEnd = ofs;

 	} else	{

 		log2("deletespace %d@%08x",bytes,ofs);

-		dbHeader.slackSpace+=bytes;

+		dbHeader.slackSpace += bytes;

 	}

 	DBWrite(0,&dbHeader,sizeof(dbHeader));

 	DBFill(ofs,bytes);

@@ -86,11 +83,11 @@ DWORD ReallocSpace(DWORD ofs,int oldSize,int newSize)
 

 	if (ofs+oldSize == dbHeader.ofsFileEnd) {

 		ofsNew = ofs;

-		dbHeader.ofsFileEnd+=newSize-oldSize;

+		dbHeader.ofsFileEnd += newSize-oldSize;

 		DBWrite(0,&dbHeader,sizeof(dbHeader));

 		log3("adding newspace %d@%08x+%d",newSize,ofsNew,oldSize);

 	} else {

-		ofsNew=CreateNewSpace(newSize);

+		ofsNew = CreateNewSpace(newSize);

 		DBMoveChunk(ofsNew,ofs,oldSize);

 		DeleteSpace(ofs,oldSize);

 	}

@@ -99,10 +96,7 @@ DWORD ReallocSpace(DWORD ofs,int oldSize,int newSize)
 

 void UnloadDatabaseModule(void)

 {

-	//UninitIni();

-	UninitEvents();

 	UninitSettings();

-	UninitContacts();

 	UninitModuleNames();

 	UninitCache();

 	UnloadDatabase();

@@ -114,8 +108,8 @@ int LoadDatabaseModule(void)
 	InitializeCriticalSection(&csDbAccess);

 	log0("DB logging running");

 	{

-		DWORD dummy=0;

-		hDbFile=CreateFileA(szDbPath,GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ, NULL, OPEN_ALWAYS, 0, NULL);

+		DWORD dummy = 0;

+		hDbFile = CreateFile(szDbPath,GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ, NULL, OPEN_ALWAYS, 0, NULL);

 		if ( hDbFile == INVALID_HANDLE_VALUE ) {

 			return 1;

 		}

@@ -124,17 +118,16 @@ int LoadDatabaseModule(void)
 			return 1;

 		}

 	}

-	//if(ParseCommandLine()) return 1;

-	if(InitCache()) return 1;

-	if(InitModuleNames()) return 1;

-	if(InitContacts()) return 1;

-	if(InitSettings()) return 1;

-	if(InitEvents()) return 1;

-	if(InitCrypt()) return 1;

+

+	if (InitCache()) return 1;

+	if (InitModuleNames()) return 1;

+	if (InitContacts()) return 1;

+	if (InitSettings()) return 1;

+	if (InitEvents()) return 1;

 	return 0;

 }

 

-static DWORD DatabaseCorrupted=0;

+static DWORD DatabaseCorrupted = 0;

 static TCHAR *msg = NULL;

 static DWORD dwErr = 0;

 

@@ -144,7 +137,7 @@ void __cdecl dbpanic(void *arg)
 	{

 		TCHAR err[256];

 

-		if (dwErr==ERROR_DISK_FULL)

+		if (dwErr == ERROR_DISK_FULL)

 			msg = TranslateT("Disk is full. Miranda will now shutdown.");

 

 		mir_sntprintf(err, SIZEOF(err), msg, TranslateT("Database failure. Miranda will now shutdown."), dwErr);

@@ -159,10 +152,10 @@ void __cdecl dbpanic(void *arg)
 

 void DatabaseCorruption(TCHAR *text)

 {

-	int kill=0;

+	int kill = 0;

 

 	EnterCriticalSection(&csDbAccess);

-	if (DatabaseCorrupted==0) {

+	if (DatabaseCorrupted == 0) {

 		DatabaseCorrupted++;

 		kill++;

 		msg = text;

@@ -191,7 +184,7 @@ void DBLog(const char *file,int line,const char *fmt,...)
 	va_start(vararg,fmt);

 	mir_vsnprintf(str,sizeof(str),fmt,vararg);

 	va_end(vararg);

-	fp=fopen("c:\\mirandadatabase.log.txt","at");

+	fp = fopen("c:\\mirandadatabase.log.txt","at");

 	fprintf(fp,"%u: %s %d: %s\n",GetTickCount(),file,line,str);

 	fclose(fp);

 }

diff --git a/plugins/Db3x_mmap/database.h b/plugins/Db3x_mmap/database.h
index 3dd602c8b9..3760711db3 100644
--- a/plugins/Db3x_mmap/database.h
+++ b/plugins/Db3x_mmap/database.h
@@ -39,7 +39,7 @@ DBHeader
  |   |   \-->module name (DBModuleName)

  |   \-->first/last/firstunread event

  |-->user contact (DBContact)

- |   |-->next contact=NULL

+ |   |-->next contact = NULL

  |   |-->first settings	as above

  |   \-->first/last/firstunread event as above

  \-->first module name (DBModuleName)

@@ -56,12 +56,12 @@ struct DBSignature {
   BYTE eof;

 };

 

-static struct DBSignature dbSignature={"Miranda ICQ DB",0x1A};

+static struct DBSignature dbSignature = {"Miranda ICQ DB",0x1A};

 

 #include <pshpack1.h>

 struct DBHeader {

   BYTE signature[16];      // 'Miranda ICQ DB',0,26

-  DWORD version;		   //as 4 bytes, ie 1.2.3.10=0x0102030a

+  DWORD version;		   //as 4 bytes, ie 1.2.3.10 = 0x0102030a

                            //this version is 0x00000700

   DWORD ofsFileEnd;		   //offset of the end of the database - place to write

                            //new structures

@@ -70,13 +70,15 @@ struct DBHeader {
 						   //re-making them at the end. We should compact when

 						   //this gets above a threshold

   DWORD contactCount;	   //number of contacts in the chain,excluding the user

-  DWORD ofsFirstContact;   //offset to first struct DBContact in the chain

-  DWORD ofsUser;		   //offset to struct DBContact representing the user

+  DWORD ofsFirstContact;   //offset to first DBContact in the chain

+  DWORD ofsUser;		   //offset to DBContact representing the user

   DWORD ofsFirstModuleName;	//offset to first struct DBModuleName in the chain

 };

 

 #define DBCONTACT_SIGNATURE   0x43DECADEu

-struct DBContact {

+

+struct DBContact

+{

   DWORD signature;

   DWORD ofsNext;			 //offset to the next contact in the chain. zero if

                              //this is the 'user' contact or the last contact

@@ -92,7 +94,8 @@ struct DBContact {
 };

 

 #define DBMODULENAME_SIGNATURE  0x4DDECADEu

-struct DBModuleName {

+struct DBModuleName

+{

   DWORD signature;

   DWORD ofsNext;		//offset to the next module name in the chain

   BYTE cbName;			//number of characters in this module name

@@ -100,7 +103,8 @@ struct DBModuleName {
 };

 

 #define DBCONTACTSETTINGS_SIGNATURE  0x53DECADEu

-struct DBContactSettings {

+struct DBContactSettings

+{

   DWORD signature;

   DWORD ofsNext;		 //offset to the next contactsettings in the chain

   DWORD ofsModuleName;	 //offset to the DBModuleName of the owner of these

@@ -109,13 +113,13 @@ struct DBContactSettings {
                          //actual size for reducing the number of moves

 						 //required using granularity in resizing

   BYTE blob[1];			 //the blob. a back-to-back sequence of DBSetting

-                         //structs, the last has cbName=0

+                         //structs, the last has cbName = 0

 };

 

 /*	not a valid structure, content is figured out on the fly

 struct DBSetting {

   BYTE cbName;			//number of bytes in the name of this setting

-                        //this =0 marks the end

+                        //this  = 0 marks the end

   char szName[...];		//setting name, excluding nul

   BYTE dataType;		//type of data. see m_database.h, db/contact/getsetting

   union {			   //a load of types of data, length is defined by dataType

@@ -133,18 +137,20 @@ struct DBSetting {
 */

 

 #define DBEVENT_SIGNATURE  0x45DECADEu

-struct DBEvent {

-  DWORD signature;

-  DWORD ofsPrev,ofsNext;	 //offset to the previous and next events in the

-                             //chain. Chain is sorted chronologically

-  DWORD ofsModuleName;		 //offset to a DBModuleName struct of the name of

-                             //the owner of this event

-  DWORD timestamp;			 //seconds since 00:00:00 01/01/1970

-  DWORD flags;				 //see m_database.h, db/event/add

-  WORD eventType;			 //module-defined event type

-  DWORD cbBlob;				 //number of bytes in the blob

-  BYTE blob[1];				 //the blob. module-defined formatting

+struct DBEvent

+{

+	DWORD signature;

+	DWORD ofsPrev,ofsNext;	 //offset to the previous and next events in the

+	//chain. Chain is sorted chronologically

+	DWORD ofsModuleName;		 //offset to a DBModuleName struct of the name of

+	//the owner of this event

+	DWORD timestamp;			 //seconds since 00:00:00 01/01/1970

+	DWORD flags;				 //see m_database.h, db/event/add

+	WORD eventType;			 //module-defined event type

+	DWORD cbBlob;				 //number of bytes in the blob

+	BYTE blob[1];				 //the blob. module-defined formatting

 };

+

 #include <poppack.h>

 

 typedef struct

@@ -181,6 +187,9 @@ typedef struct
 //databasecorruption: with NULL called if any signatures are broken. very very fatal

 void DatabaseCorruption(TCHAR *text);

 PBYTE DBRead(DWORD ofs,int bytesRequired,int *bytesAvail);	//any preview result could be invalidated by the next call

+__forceinline PBYTE DBRead(HANDLE hContact,int bytesRequired,int *bytesAvail)

+{	return DBRead((DWORD)hContact, bytesRequired, bytesAvail);

+}

 void DBWrite(DWORD ofs,PVOID pData,int count);

 void DBFill(DWORD ofs,int bytes);

 void DBFlush(int setting);

@@ -196,6 +205,22 @@ int CreateDbHeaders(HANDLE hFile);
 int LoadDatabaseModule(void);

 void UnloadDatabaseModule(void);

 

+DBCachedContactValueList* AddToCachedContactList(HANDLE hContact, int index);

+int CheckProto(HANDLE hContact, const char *proto);

+

+void FreeCachedVariant( DBVARIANT* V );

+

+extern CRITICAL_SECTION csDbAccess;

+extern struct DBHeader dbHeader;

+extern HANDLE hDbFile;

+

+extern HANDLE hCacheHeap;

+extern SortedList lContacts;

+extern HANDLE hLastCachedContact;

+extern HANDLE hContactDeletedEvent,hContactAddedEvent;

+

+extern BOOL safetyMode;

+

 #define MAXCACHEDREADSIZE     65536

 

 //#define DBLOGGING

diff --git a/plugins/Db3x_mmap/db3x_mmap_10.vcxproj b/plugins/Db3x_mmap/db3x_mmap_10.vcxproj
index 793f1ac4ef..22cbaeca69 100644
--- a/plugins/Db3x_mmap/db3x_mmap_10.vcxproj
+++ b/plugins/Db3x_mmap/db3x_mmap_10.vcxproj
@@ -208,9 +208,9 @@
     <ClCompile Include="dbcontacts.cpp" />

     <ClCompile Include="dbevents.cpp" />

     <ClCompile Include="dbheaders.cpp" />

+    <ClCompile Include="dbintf.cpp" />

     <ClCompile Include="dbmodulechain.cpp" />

     <ClCompile Include="dbsettings.cpp" />

-    <ClCompile Include="encrypt.cpp" />

     <ClCompile Include="init.cpp">

       <PrecompiledHeader>Create</PrecompiledHeader>

     </ClCompile>

@@ -218,6 +218,7 @@
   <ItemGroup>

     <ClInclude Include="commonheaders.h" />

     <ClInclude Include="database.h" />

+    <ClInclude Include="dbintf.h" />

   </ItemGroup>

   <ItemGroup>

     <ResourceCompile Include="db3x_mmap.rc" />

diff --git a/plugins/Db3x_mmap/db3x_mmap_10.vcxproj.filters b/plugins/Db3x_mmap/db3x_mmap_10.vcxproj.filters
index 667339ebe6..2f8143f35e 100644
--- a/plugins/Db3x_mmap/db3x_mmap_10.vcxproj.filters
+++ b/plugins/Db3x_mmap/db3x_mmap_10.vcxproj.filters
@@ -15,9 +15,6 @@
     </Filter>

   </ItemGroup>

   <ItemGroup>

-    <ClCompile Include="commonheaders.cpp">

-      <Filter>Source Files</Filter>

-    </ClCompile>

     <ClCompile Include="database.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

@@ -39,10 +36,10 @@
     <ClCompile Include="dbsettings.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="encrypt.cpp">

+    <ClCompile Include="init.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="init.cpp">

+    <ClCompile Include="dbintf.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

   </ItemGroup>

@@ -53,6 +50,9 @@
     <ClInclude Include="database.h">

       <Filter>Header Files</Filter>

     </ClInclude>

+    <ClInclude Include="dbintf.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

   </ItemGroup>

   <ItemGroup>

     <ResourceCompile Include="db3x_mmap.rc">

diff --git a/plugins/Db3x_mmap/dbcache.cpp b/plugins/Db3x_mmap/dbcache.cpp
index f5b953f615..1e9369cc85 100644
--- a/plugins/Db3x_mmap/dbcache.cpp
+++ b/plugins/Db3x_mmap/dbcache.cpp
@@ -65,7 +65,7 @@ void ReMap(DWORD needed)
 		}

 	}

 	else

-		dwFileSize += ChunkSize;

+		dwFileSize  +=  ChunkSize;

 

 //	FlushViewOfFile(pDbCache, 0);

 	UnmapViewOfFile(pDbCache);

@@ -97,7 +97,7 @@ void DBMoveChunk(DWORD ofsDest,DWORD ofsSource,int bytes)
 PBYTE DBRead(DWORD ofs,int bytesRequired,int *bytesAvail)

 {

 	// buggy read

-	if (ofs>=dwFileSize) {

+	if (ofs>= dwFileSize) {

 		log2("read from outside %d@%08x",bytesRequired,ofs);

 		if (bytesAvail!=NULL) *bytesAvail = ChunkSize;

 		return pNull;

@@ -120,7 +120,7 @@ void DBWrite(DWORD ofs,PVOID pData,int bytes)
 void DBFill(DWORD ofs,int bytes)

 {

 	log2("zerofill %d@%08x",bytes,ofs);

-	if (ofs+bytes<=dwFileSize)

+	if (ofs+bytes <= dwFileSize)

 		ZeroMemory(pDbCache+ofs,bytes);

 	logg();

 }

@@ -146,7 +146,7 @@ void DBFlush(int setting)
 {

 	if (!setting) {

 		log0("nflush1");

-		if(safetyMode && pDbCache) {

+		if (safetyMode && pDbCache) {

 			if (FlushViewOfFile(pDbCache, 0) == 0) {

 				if (flushFailTick == 0)

 					flushFailTick = GetTickCount();

@@ -160,13 +160,13 @@ void DBFlush(int setting)
 		return;

 	}

 	KillTimer(NULL,flushBuffersTimerId);

-	flushBuffersTimerId=SetTimer(NULL,flushBuffersTimerId,50,DoBufferFlushTimerProc);

+	flushBuffersTimerId = SetTimer(NULL,flushBuffersTimerId,50,DoBufferFlushTimerProc);

 }

 

 static INT_PTR CacheSetSafetyMode(WPARAM wParam,LPARAM lParam)

 {

 	EnterCriticalSection(&csDbAccess);

-	safetyMode=wParam;

+	safetyMode = wParam;

 	LeaveCriticalSection(&csDbAccess);

 	DBFlush(1);

 	return 0;

@@ -184,15 +184,12 @@ int InitCache(void)
 

 	// Align to chunk

 	x = dwFileSize % ChunkSize;

-	if (x) dwFileSize += ChunkSize - x;

+	if (x) dwFileSize  +=  ChunkSize - x;

 

 	Map();

 

 	// zero region for reads outside the file

 	pNull = (PBYTE)calloc(ChunkSize, 1);

-

-	CreateServiceFunction(MS_DB_SETSAFETYMODE, CacheSetSafetyMode);

-

 	return 0;

 }

 

diff --git a/plugins/Db3x_mmap/dbcontacts.cpp b/plugins/Db3x_mmap/dbcontacts.cpp
index 0afd3469ab..a827db3385 100644
--- a/plugins/Db3x_mmap/dbcontacts.cpp
+++ b/plugins/Db3x_mmap/dbcontacts.cpp
@@ -23,39 +23,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 

 #include "commonheaders.h"

 

-extern HANDLE hCacheHeap;

-extern SortedList lContacts;

-extern HANDLE hLastCachedContact;

-

-INT_PTR GetContactSettingStatic(WPARAM wParam,LPARAM lParam);

-void FreeCachedVariant( DBVARIANT* V );

-

-static INT_PTR GetContactCount(WPARAM wParam,LPARAM lParam);

-static INT_PTR FindFirstContact(WPARAM wParam,LPARAM lParam);

-static INT_PTR FindNextContact(WPARAM wParam,LPARAM lParam);

-static INT_PTR DeleteContact(WPARAM wParam,LPARAM lParam);

-static INT_PTR AddContact(WPARAM wParam,LPARAM lParam);

-static INT_PTR IsDbContact(WPARAM wParam,LPARAM lParam);

-

-static HANDLE hContactDeletedEvent,hContactAddedEvent;

-

-

-int InitContacts(void)

-{

-	CreateServiceFunction(MS_DB_CONTACT_GETCOUNT,GetContactCount);

-	CreateServiceFunction(MS_DB_CONTACT_FINDFIRST,FindFirstContact);

-	CreateServiceFunction(MS_DB_CONTACT_FINDNEXT,FindNextContact);

-	CreateServiceFunction(MS_DB_CONTACT_DELETE,DeleteContact);

-	CreateServiceFunction(MS_DB_CONTACT_ADD,AddContact);

-	CreateServiceFunction(MS_DB_CONTACT_IS,IsDbContact);

-	hContactDeletedEvent=CreateHookableEvent(ME_DB_CONTACT_DELETED);

-	hContactAddedEvent=CreateHookableEvent(ME_DB_CONTACT_ADDED);

-	return 0;

-}

-

-void UninitContacts(void)

-{

-}

+HANDLE hContactDeletedEvent, hContactAddedEvent;

 

 DBCachedContactValueList* AddToCachedContactList(HANDLE hContact, int index)

 {

@@ -67,20 +35,10 @@ DBCachedContactValueList* AddToCachedContactList(HANDLE hContact, int index)
 	return VL;

 }

 

-static INT_PTR GetContactCount(WPARAM wParam,LPARAM lParam)

-{

-	int ret;

-

-	EnterCriticalSection(&csDbAccess);

-	ret=dbHeader.contactCount;

-	LeaveCriticalSection(&csDbAccess);

-	return ret;

-}

-

 #define proto_module  "Protocol"

 #define proto_setting "p"

 

-static int CheckProto(HANDLE hContact, const char *proto)

+int CDdxMmap::CheckProto(HANDLE hContact, const char *proto)

 {

 	static char protobuf[MAX_PATH] = {0};

 	static DBVARIANT dbv;

@@ -90,44 +48,54 @@ static int CheckProto(HANDLE hContact, const char *proto)
 	dbv.pszVal = protobuf;

 	dbv.cchVal = sizeof(protobuf);

 

-	if (GetContactSettingStatic((WPARAM)hContact, (LPARAM )&sVal) != 0

-		|| (dbv.type != DBVT_ASCIIZ)) return 0;

+	if (GetContactSettingStatic(hContact, &sVal) != 0 || (dbv.type != DBVT_ASCIIZ))

+		return 0;

 

 	return !strcmp(protobuf,proto);

 }

 

-static INT_PTR FindFirstContact(WPARAM wParam,LPARAM lParam)

+int InitContacts(void)

 {

-	INT_PTR ret = 0;

-	EnterCriticalSection(&csDbAccess);

-	ret = (INT_PTR)dbHeader.ofsFirstContact;

-	if (lParam && !CheckProto((HANDLE)ret,(const char*)lParam))

-		ret = FindNextContact((WPARAM)ret,lParam);

-	LeaveCriticalSection(&csDbAccess);

+	hContactDeletedEvent = CreateHookableEvent(ME_DB_CONTACT_DELETED);

+	hContactAddedEvent = CreateHookableEvent(ME_DB_CONTACT_ADDED);

+	return 0;

+}

+

+STDMETHODIMP_(LONG) CDdxMmap::GetContactCount(void)

+{

+	mir_cslock lck(csDbAccess);

+	return dbHeader.contactCount;

+}

+

+STDMETHODIMP_(HANDLE) CDdxMmap::FindFirstContact(const char *szProto)

+{

+	mir_cslock lck(csDbAccess);

+	HANDLE ret = (HANDLE)dbHeader.ofsFirstContact;

+	if (szProto && !CheckProto(ret, szProto))

+		ret = FindNextContact(ret, szProto);

 	return ret;

 }

 

-static INT_PTR FindNextContact(WPARAM wParam,LPARAM lParam)

+STDMETHODIMP_(HANDLE) CDdxMmap::FindNextContact(HANDLE hContact, const char *szProto)

 {

 	int index;

-	struct DBContact *dbc;

+	DBContact *dbc;

 	DBCachedContactValueList VLtemp, *VL = NULL;

-	VLtemp.hContact = (HANDLE)wParam;

-	EnterCriticalSection(&csDbAccess);

+	VLtemp.hContact = hContact;

+

+	mir_cslock lck(csDbAccess);

 	while(VLtemp.hContact) {

 		if ( List_GetIndex(&lContacts,&VLtemp,&index)) {

 			VL = ( DBCachedContactValueList* )lContacts.items[index];

 			if (VL->hNext != NULL) {

-				if (!lParam || CheckProto(VL->hNext,(const char*)lParam)) {

-					LeaveCriticalSection(&csDbAccess);

-					return (INT_PTR)VL->hNext;

-				}

-				else {

-					VLtemp.hContact = VL->hNext;

-					continue;

-		}	}	}

-

-		dbc=(struct DBContact*)DBRead((DWORD)VLtemp.hContact,sizeof(struct DBContact),NULL);

+				if (!szProto || CheckProto(VL->hNext, szProto))

+					return VL->hNext;

+

+				VLtemp.hContact = VL->hNext;

+				continue;

+		}	}

+

+		dbc = (DBContact*)DBRead(VLtemp.hContact,sizeof(DBContact),NULL);

 		if (dbc->signature!=DBCONTACT_SIGNATURE)

 			break;

 		else {

@@ -135,135 +103,132 @@ static INT_PTR FindNextContact(WPARAM wParam,LPARAM lParam)
 				VL = AddToCachedContactList(VLtemp.hContact,index);

 

 			VL->hNext = (HANDLE)dbc->ofsNext;

-			if (VL->hNext != NULL && (!lParam || CheckProto(VL->hNext,(const char*)lParam))) {

+			if (VL->hNext != NULL && (!szProto || CheckProto(VL->hNext, szProto))) {

 				LeaveCriticalSection(&csDbAccess);

-				return (INT_PTR)VL->hNext;

+				return VL->hNext;

 			}

 			VLtemp.hContact = VL->hNext;

 	}	}

-	LeaveCriticalSection(&csDbAccess);

-	return 0;

+

+	return NULL;

 }

 

-static INT_PTR DeleteContact(WPARAM wParam,LPARAM lParam)

+STDMETHODIMP_(LONG) CDdxMmap::DeleteContact(HANDLE hContact)

 {

-	struct DBContact *dbc,*dbcPrev;

 	DWORD ofsThis,ofsNext,ofsFirstEvent;

-	struct DBContactSettings *dbcs;

-	struct DBEvent *dbe;

+	DBContactSettings *dbcs;

+	DBEvent *dbe;

 	int index;

 

-	if ((HANDLE)wParam==NULL) return 1;

-	EnterCriticalSection(&csDbAccess);

-	dbc=(struct DBContact*)DBRead(wParam,sizeof(struct DBContact),NULL);

-	if(dbc->signature!=DBCONTACT_SIGNATURE) {

-		LeaveCriticalSection(&csDbAccess);

-		return 1;

-	}

-	if ( (HANDLE)wParam == (HANDLE)dbHeader.ofsUser ) {

-		LeaveCriticalSection(&csDbAccess);

-		log0("FATAL: del of user chain attempted.");

+	if (hContact == NULL)

 		return 1;

+

+	{

+		mir_cslock lck(csDbAccess);

+		DBContact *dbc = (DBContact*)DBRead(hContact, sizeof(DBContact), NULL);

+		if (dbc->signature != DBCONTACT_SIGNATURE) {

+			LeaveCriticalSection(&csDbAccess);

+			return 1;

+		}

+		if (hContact == (HANDLE)dbHeader.ofsUser) {

+			LeaveCriticalSection(&csDbAccess);

+			log0("FATAL: del of user chain attempted.");

+			return 1;

+		}

+		log0("del contact");

 	}

-	log0("del contact");

-	LeaveCriticalSection(&csDbAccess);

+

 	//call notifier while outside mutex

-	NotifyEventHooks(hContactDeletedEvent,wParam,0);

+	NotifyEventHooks(hContactDeletedEvent, (WPARAM)hContact, 0);

+

 	//get back in

-	EnterCriticalSection(&csDbAccess);

+	mir_cslock lck(csDbAccess);

 

-	{	DBCachedContactValueList VLtemp;

-		VLtemp.hContact = (HANDLE)wParam;

-		if ( List_GetIndex(&lContacts,&VLtemp,&index))

-		{

-			DBCachedContactValueList *VL = ( DBCachedContactValueList* )lContacts.items[index];

-			DBCachedContactValue* V = VL->first;

-			while ( V != NULL ) {

-				DBCachedContactValue* V1 = V->next;

-				FreeCachedVariant(&V->value);

-				HeapFree( hCacheHeap, 0, V );

-				V = V1;

-			}

-			HeapFree( hCacheHeap, 0, VL );

+	DBCachedContactValueList VLtemp;

+	VLtemp.hContact = hContact;

+	if ( List_GetIndex(&lContacts,&VLtemp,&index))

+	{

+		DBCachedContactValueList *VL = ( DBCachedContactValueList* )lContacts.items[index];

+		DBCachedContactValue* V = VL->first;

+		while ( V != NULL ) {

+			DBCachedContactValue* V1 = V->next;

+			FreeCachedVariant(&V->value);

+			HeapFree( hCacheHeap, 0, V );

+			V = V1;

+		}

+		HeapFree( hCacheHeap, 0, VL );

 

-			if (VLtemp.hContact == hLastCachedContact)

-				hLastCachedContact = NULL;

-			List_Remove(&lContacts,index);

-	}	}

+		if (VLtemp.hContact == hLastCachedContact)

+			hLastCachedContact = NULL;

+		List_Remove(&lContacts,index);

+	}

 

-	dbc=(struct DBContact*)DBRead(wParam,sizeof(struct DBContact),NULL);

+	DBContact *dbc = (DBContact*)DBRead(hContact, sizeof(DBContact), NULL);

 	//delete settings chain

-	ofsThis=dbc->ofsFirstSettings;

-	ofsFirstEvent=dbc->ofsFirstEvent;

+	ofsThis = dbc->ofsFirstSettings;

+	ofsFirstEvent = dbc->ofsFirstEvent;

 	while(ofsThis) {

-		dbcs=(struct DBContactSettings*)DBRead(ofsThis,sizeof(struct DBContactSettings),NULL);

-		ofsNext=dbcs->ofsNext;

+		dbcs = (struct DBContactSettings*)DBRead(ofsThis,sizeof(struct DBContactSettings),NULL);

+		ofsNext = dbcs->ofsNext;

 		DeleteSpace(ofsThis,offsetof(struct DBContactSettings,blob)+dbcs->cbBlob);

-		ofsThis=ofsNext;

+		ofsThis = ofsNext;

 	}

 	//delete event chain

-	ofsThis=ofsFirstEvent;

+	ofsThis = ofsFirstEvent;

 	while(ofsThis) {

-		dbe=(struct DBEvent*)DBRead(ofsThis,sizeof(struct DBEvent),NULL);

-		ofsNext=dbe->ofsNext;

-		DeleteSpace(ofsThis,offsetof(struct DBEvent,blob)+dbe->cbBlob);

-		ofsThis=ofsNext;

+		dbe = (DBEvent*)DBRead(ofsThis,sizeof(DBEvent),NULL);

+		ofsNext = dbe->ofsNext;

+		DeleteSpace(ofsThis,offsetof(DBEvent,blob)+dbe->cbBlob);

+		ofsThis = ofsNext;

 	}

 	//find previous contact in chain and change ofsNext

-	dbc=(struct DBContact*)DBRead(wParam,sizeof(struct DBContact),NULL);

-	if(dbHeader.ofsFirstContact==wParam) {

-		dbHeader.ofsFirstContact=dbc->ofsNext;

+	dbc = (DBContact*)DBRead(hContact, sizeof(DBContact), NULL);

+	if (dbHeader.ofsFirstContact == (DWORD)hContact) {

+		dbHeader.ofsFirstContact = dbc->ofsNext;

 		DBWrite(0,&dbHeader,sizeof(dbHeader));

 	}

 	else {

-		ofsNext=dbc->ofsNext;

-		ofsThis=dbHeader.ofsFirstContact;

-		dbcPrev=(struct DBContact*)DBRead(ofsThis,sizeof(struct DBContact),NULL);

-		while(dbcPrev->ofsNext!=wParam) {

-			if(dbcPrev->ofsNext==0) DatabaseCorruption(NULL);

-			ofsThis=dbcPrev->ofsNext;

-			dbcPrev=(struct DBContact*)DBRead(ofsThis,sizeof(struct DBContact),NULL);

+		ofsNext = dbc->ofsNext;

+		ofsThis = dbHeader.ofsFirstContact;

+		DBContact *dbcPrev = (DBContact*)DBRead(ofsThis,sizeof(DBContact),NULL);

+		while(dbcPrev->ofsNext != (DWORD)hContact) {

+			if (dbcPrev->ofsNext == 0) DatabaseCorruption(NULL);

+			ofsThis = dbcPrev->ofsNext;

+			dbcPrev = (DBContact*)DBRead(ofsThis,sizeof(DBContact),NULL);

+		}

+		dbcPrev->ofsNext = ofsNext;

+		DBWrite(ofsThis,dbcPrev,sizeof(DBContact));

+		

+		DBCachedContactValueList VLtemp;

+		VLtemp.hContact = (HANDLE)ofsThis;

+		if ( List_GetIndex(&lContacts,&VLtemp,&index)) {

+			DBCachedContactValueList *VL = ( DBCachedContactValueList* )lContacts.items[index];

+			VL->hNext = ( HANDLE )ofsNext;

 		}

-		dbcPrev->ofsNext=ofsNext;

-		DBWrite(ofsThis,dbcPrev,sizeof(struct DBContact));

-		{

-			DBCachedContactValueList VLtemp;

-			VLtemp.hContact = (HANDLE)ofsThis;

-			if ( List_GetIndex(&lContacts,&VLtemp,&index))

-			{

-				DBCachedContactValueList *VL = ( DBCachedContactValueList* )lContacts.items[index];

-				VL->hNext = ( HANDLE )ofsNext;

-		}	}

 	}

+

 	//delete contact

-	DeleteSpace(wParam,sizeof(struct DBContact));

+	DeleteSpace((DWORD)hContact, sizeof(DBContact));

 	//decrement contact count

 	dbHeader.contactCount--;

 	DBWrite(0,&dbHeader,sizeof(dbHeader));

 	DBFlush(0);

-	//quit

-	LeaveCriticalSection(&csDbAccess);

 	return 0;

 }

 

-static INT_PTR AddContact(WPARAM wParam,LPARAM lParam)

+STDMETHODIMP_(HANDLE) CDdxMmap::AddContact()

 {

-	struct DBContact dbc;

-	DWORD ofsNew;

-

 	log0("add contact");

-	EnterCriticalSection(&csDbAccess);

-	ofsNew=CreateNewSpace(sizeof(struct DBContact));

-	dbc.signature=DBCONTACT_SIGNATURE;

-	dbc.eventCount=0;

-	dbc.ofsFirstEvent=dbc.ofsLastEvent=0;

-	dbc.ofsFirstSettings=0;

-	dbc.ofsNext=dbHeader.ofsFirstContact;

-	dbc.ofsFirstUnreadEvent=0;

-	dbc.timestampFirstUnread=0;

-	dbHeader.ofsFirstContact=ofsNew;

+

+	mir_cslock lck(csDbAccess);

+	DWORD ofsNew = CreateNewSpace(sizeof(DBContact));

+

+	DBContact dbc = { 0 };

+	dbc.signature = DBCONTACT_SIGNATURE;

+	dbc.ofsNext = dbHeader.ofsFirstContact;

+	dbHeader.ofsFirstContact = ofsNew;

 	dbHeader.contactCount++;

-	DBWrite(ofsNew,&dbc,sizeof(struct DBContact));

+	DBWrite(ofsNew,&dbc,sizeof(DBContact));

 	DBWrite(0,&dbHeader,sizeof(dbHeader));

 	DBFlush(0);

 

@@ -271,27 +236,27 @@ static INT_PTR AddContact(WPARAM wParam,LPARAM lParam)
 

 	LeaveCriticalSection(&csDbAccess);

 	NotifyEventHooks(hContactAddedEvent,(WPARAM)ofsNew,0);

-	return (INT_PTR)ofsNew;

+	return (HANDLE)ofsNew;

 }

 

-static INT_PTR IsDbContact(WPARAM wParam,LPARAM lParam)

+STDMETHODIMP_(BOOL) CDdxMmap::IsDbContact(HANDLE hContact)

 {

-	struct DBContact *dbc;

-	DWORD ofsContact=(DWORD)wParam;

+	DBContact *dbc;

+	DWORD ofsContact = (DWORD)hContact;

 	int ret;

 

 	EnterCriticalSection(&csDbAccess);

 	{

 		int index;

 		DBCachedContactValueList VLtemp;

-		VLtemp.hContact = (HANDLE)wParam;

+		VLtemp.hContact = hContact;

 		if ( List_GetIndex(&lContacts,&VLtemp,&index))

 			ret = TRUE;

 		else {

-			dbc=(struct DBContact*)DBRead(ofsContact,sizeof(struct DBContact),NULL);

-			ret=dbc->signature==DBCONTACT_SIGNATURE;

+			dbc = (DBContact*)DBRead(ofsContact,sizeof(DBContact),NULL);

+			ret = dbc->signature == DBCONTACT_SIGNATURE;

 			if (ret)

-				AddToCachedContactList((HANDLE)wParam, index);

+				AddToCachedContactList(hContact, index);

 	}	}

 

 	LeaveCriticalSection(&csDbAccess);

diff --git a/plugins/Db3x_mmap/dbevents.cpp b/plugins/Db3x_mmap/dbevents.cpp
index 76d1cd4a28..c7a44d2e4e 100644
--- a/plugins/Db3x_mmap/dbevents.cpp
+++ b/plugins/Db3x_mmap/dbevents.cpp
@@ -30,74 +30,73 @@ char *GetModuleNameByOfs(DWORD ofs);
 

 static HANDLE hEventDeletedEvent,hEventAddedEvent,hEventFilterAddedEvent;

 

-static INT_PTR GetEventCount(WPARAM wParam,LPARAM lParam)

+STDMETHODIMP_(LONG) CDdxMmap::GetEventCount(HANDLE hContact)

 {

-	INT_PTR ret;

-	struct DBContact *dbc;

+	LONG ret;

 

 	EnterCriticalSection(&csDbAccess);

-	if(wParam==0) wParam=dbHeader.ofsUser;

-	dbc=(struct DBContact*)DBRead(wParam,sizeof(struct DBContact),NULL);

-	if(dbc->signature!=DBCONTACT_SIGNATURE) ret=-1;

-	else ret=dbc->eventCount;

+	if (hContact == 0)

+		hContact = (HANDLE)dbHeader.ofsUser;

+	DBContact *dbc = (DBContact*)DBRead(hContact,sizeof(DBContact),NULL);

+	if (dbc->signature != DBCONTACT_SIGNATURE) ret = -1;

+	else ret = dbc->eventCount;

 	LeaveCriticalSection(&csDbAccess);

 	return ret;

 }

 

-static INT_PTR AddEvent(WPARAM wParam,LPARAM lParam)

+STDMETHODIMP_(HANDLE) CDdxMmap::AddEvent(HANDLE hContact, DBEVENTINFO *dbei)

 {

-	DBEVENTINFO *dbei=(DBEVENTINFO*)lParam;

-	struct DBContact dbc;

-	struct DBEvent dbe,*dbeTest;

+	DBContact dbc;

+	DBEvent dbe,*dbeTest;

 	DWORD ofsNew,ofsModuleName,ofsContact,ofsThis;

 	BOOL neednotify;

 

-	if(dbei==NULL||dbei->cbSize!=sizeof(DBEVENTINFO)) return 0;

-	if(dbei->timestamp==0) return 0;

-	if (NotifyEventHooks(hEventFilterAddedEvent,wParam,lParam)) {

+	if (dbei == NULL||dbei->cbSize!=sizeof(DBEVENTINFO)) return 0;

+	if (dbei->timestamp == 0) return 0;

+	if (NotifyEventHooks(hEventFilterAddedEvent, (WPARAM)hContact, (LPARAM)dbei)) {

 		return 0;

 	}

 	EnterCriticalSection(&csDbAccess);

-	if(wParam==0) ofsContact=dbHeader.ofsUser;

-	else ofsContact=(DWORD)wParam;

-	dbc=*(struct DBContact*)DBRead(ofsContact,sizeof(struct DBContact),NULL);

-	if(dbc.signature!=DBCONTACT_SIGNATURE) {

+	if (hContact == 0) ofsContact = dbHeader.ofsUser;

+	else ofsContact = (DWORD)hContact;

+	dbc = *(DBContact*)DBRead(ofsContact,sizeof(DBContact),NULL);

+	if (dbc.signature!=DBCONTACT_SIGNATURE) {

 		LeaveCriticalSection(&csDbAccess);

 	  	return 0;

 	}

-	ofsNew=CreateNewSpace(offsetof(struct DBEvent,blob)+dbei->cbBlob);

-	ofsModuleName=GetModuleNameOfs(dbei->szModule);

-

-	dbe.signature=DBEVENT_SIGNATURE;

-	dbe.ofsModuleName=ofsModuleName;

-	dbe.timestamp=dbei->timestamp;

-	dbe.flags=dbei->flags;

-	dbe.eventType=dbei->eventType;

-	dbe.cbBlob=dbei->cbBlob;

+	ofsNew = CreateNewSpace(offsetof(DBEvent,blob)+dbei->cbBlob);

+	ofsModuleName = GetModuleNameOfs(dbei->szModule);

+

+	dbe.signature = DBEVENT_SIGNATURE;

+	dbe.ofsModuleName = ofsModuleName;

+	dbe.timestamp = dbei->timestamp;

+	dbe.flags = dbei->flags;

+	dbe.eventType = dbei->eventType;

+	dbe.cbBlob = dbei->cbBlob;

 	//find where to put it - sort by timestamp

-	if(dbc.eventCount==0) {

-		dbe.ofsPrev=wParam;

-		dbe.ofsNext=0;

-		dbe.flags|=DBEF_FIRST;

-		dbc.ofsFirstEvent=dbc.ofsLastEvent=ofsNew;

+	if (dbc.eventCount == 0) {

+		dbe.ofsPrev = (DWORD)hContact;

+		dbe.ofsNext = 0;

+		dbe.flags |= DBEF_FIRST;

+		dbc.ofsFirstEvent = dbc.ofsLastEvent = ofsNew;

 	}

 	else {

-		dbeTest=(struct DBEvent*)DBRead(dbc.ofsFirstEvent,sizeof(struct DBEvent),NULL);

+		dbeTest = (DBEvent*)DBRead(dbc.ofsFirstEvent,sizeof(DBEvent),NULL);

 		// Should new event be placed before first event in chain?

 		if (dbei->timestamp < dbeTest->timestamp) {

-			dbe.ofsPrev=wParam;

-			dbe.ofsNext=dbc.ofsFirstEvent;

-			dbe.flags|=DBEF_FIRST;

-			dbc.ofsFirstEvent=ofsNew;

-			dbeTest=(struct DBEvent*)DBRead(dbe.ofsNext,sizeof(struct DBEvent),NULL);

-			dbeTest->flags&=~DBEF_FIRST;

-			dbeTest->ofsPrev=ofsNew;

-			DBWrite(dbe.ofsNext,dbeTest,sizeof(struct DBEvent));

+			dbe.ofsPrev = (DWORD)hContact;

+			dbe.ofsNext = dbc.ofsFirstEvent;

+			dbe.flags |= DBEF_FIRST;

+			dbc.ofsFirstEvent = ofsNew;

+			dbeTest = (DBEvent*)DBRead(dbe.ofsNext,sizeof(DBEvent),NULL);

+			dbeTest->flags &= ~DBEF_FIRST;

+			dbeTest->ofsPrev = ofsNew;

+			DBWrite(dbe.ofsNext,dbeTest,sizeof(DBEvent));

 		}

 		else {

 			// Loop through the chain, starting at the end

 			ofsThis = dbc.ofsLastEvent;

-			dbeTest = (struct DBEvent*)DBRead(ofsThis, sizeof(struct DBEvent), NULL);

+			dbeTest = (DBEvent*)DBRead(ofsThis, sizeof(DBEvent), NULL);

 			for (;;) {

 				// If the new event's timesstamp is equal to or greater than the

 				// current dbevent, it will be inserted after. If not, continue

@@ -106,34 +105,34 @@ static INT_PTR AddEvent(WPARAM wParam,LPARAM lParam)
 					dbe.ofsPrev = ofsThis;

 					dbe.ofsNext = dbeTest->ofsNext;

 					dbeTest->ofsNext = ofsNew;

-					DBWrite(ofsThis, dbeTest, sizeof(struct DBEvent));

+					DBWrite(ofsThis, dbeTest, sizeof(DBEvent));

 					if (dbe.ofsNext == 0)

 						dbc.ofsLastEvent = ofsNew;

 					else {

-						dbeTest = (struct DBEvent*)DBRead(dbe.ofsNext, sizeof(struct DBEvent), NULL);

+						dbeTest = (DBEvent*)DBRead(dbe.ofsNext, sizeof(DBEvent), NULL);

 						dbeTest->ofsPrev = ofsNew;

-						DBWrite(dbe.ofsNext, dbeTest, sizeof(struct DBEvent));

+						DBWrite(dbe.ofsNext, dbeTest, sizeof(DBEvent));

 					}

 					break;

 				}

 				ofsThis = dbeTest->ofsPrev;

-				dbeTest = (struct DBEvent*)DBRead(ofsThis, sizeof(struct DBEvent), NULL);

+				dbeTest = (DBEvent*)DBRead(ofsThis, sizeof(DBEvent), NULL);

 			}

 		}

 	}

 	dbc.eventCount++;

 	if (!(dbe.flags&(DBEF_READ|DBEF_SENT))) {

-		if(dbe.timestamp<dbc.timestampFirstUnread || dbc.timestampFirstUnread==0) {

-			dbc.timestampFirstUnread=dbe.timestamp;

-			dbc.ofsFirstUnreadEvent=ofsNew;

+		if (dbe.timestamp<dbc.timestampFirstUnread || dbc.timestampFirstUnread == 0) {

+			dbc.timestampFirstUnread = dbe.timestamp;

+			dbc.ofsFirstUnreadEvent = ofsNew;

 		}

 		neednotify = TRUE;

 	}

 	else neednotify = safetyMode;

 

-	DBWrite(ofsContact,&dbc,sizeof(struct DBContact));

-	DBWrite(ofsNew,&dbe,offsetof(struct DBEvent,blob));

-	DBWrite(ofsNew+offsetof(struct DBEvent,blob),dbei->pBlob,dbei->cbBlob);

+	DBWrite(ofsContact,&dbc,sizeof(DBContact));

+	DBWrite(ofsNew,&dbe,offsetof(DBEvent,blob));

+	DBWrite(ofsNew+offsetof(DBEvent,blob),dbei->pBlob,dbei->cbBlob);

 	DBFlush(0);

 

 	LeaveCriticalSection(&csDbAccess);

@@ -141,272 +140,271 @@ static INT_PTR AddEvent(WPARAM wParam,LPARAM lParam)
 

 	// Notify only in safe mode or on really new events

 	if (neednotify)

-		NotifyEventHooks(hEventAddedEvent,wParam,(LPARAM)ofsNew);

+		NotifyEventHooks(hEventAddedEvent, (WPARAM)hContact, (LPARAM)ofsNew);

 

-	return (INT_PTR)ofsNew;

+	return (HANDLE)ofsNew;

 }

 

-static INT_PTR DeleteEvent(WPARAM wParam,LPARAM lParam)

+STDMETHODIMP_(BOOL) CDdxMmap::DeleteEvent(HANDLE hContact, HANDLE hDbEvent)

 {

-	struct DBContact dbc;

+	DBContact dbc;

 	DWORD ofsContact,ofsThis;

-	struct DBEvent dbe,*dbeNext,*dbePrev;

+	DBEvent dbe,*dbeNext,*dbePrev;

 

 	EnterCriticalSection(&csDbAccess);

-	if(wParam==0) ofsContact=dbHeader.ofsUser;

-	else ofsContact=wParam;

-	dbc=*(struct DBContact*)DBRead(ofsContact,sizeof(struct DBContact),NULL);

-	dbe=*(struct DBEvent*)DBRead(lParam,sizeof(struct DBEvent),NULL);

-	if(dbc.signature!=DBCONTACT_SIGNATURE || dbe.signature!=DBEVENT_SIGNATURE) {

+	if (hContact == 0) ofsContact = dbHeader.ofsUser;

+	else ofsContact = (DWORD)hContact;

+	dbc = *(DBContact*)DBRead(ofsContact,sizeof(DBContact),NULL);

+	dbe = *(DBEvent*)DBRead(hContact,sizeof(DBEvent),NULL);

+	if (dbc.signature!=DBCONTACT_SIGNATURE || dbe.signature!=DBEVENT_SIGNATURE) {

 		LeaveCriticalSection(&csDbAccess);

 		return 1;

 	}

 	log1("delete event @ %08x",wParam);

 	LeaveCriticalSection(&csDbAccess);

 	//call notifier while outside mutex

-	NotifyEventHooks(hEventDeletedEvent,wParam,lParam);

+	NotifyEventHooks(hEventDeletedEvent,(WPARAM)hContact, (LPARAM)hDbEvent);

 	//get back in

 	EnterCriticalSection(&csDbAccess);

-	dbc=*(struct DBContact*)DBRead(ofsContact,sizeof(struct DBContact),NULL);

-	dbe=*(struct DBEvent*)DBRead(lParam,sizeof(struct DBEvent),NULL);

+	dbc = *(DBContact*)DBRead(ofsContact,sizeof(DBContact),NULL);

+	dbe = *(DBEvent*)DBRead(hDbEvent,sizeof(DBEvent),NULL);

 	//check if this was the first unread, if so, recalc the first unread

-	if(dbc.ofsFirstUnreadEvent==(DWORD)lParam) {

-		dbeNext=&dbe;

+	if (dbc.ofsFirstUnreadEvent == (DWORD)hDbEvent) {

+		dbeNext = &dbe;

 		for (;;) {

-			if(dbeNext->ofsNext==0) {

-				dbc.ofsFirstUnreadEvent=0;

-				dbc.timestampFirstUnread=0;

+			if (dbeNext->ofsNext == 0) {

+				dbc.ofsFirstUnreadEvent = 0;

+				dbc.timestampFirstUnread = 0;

 				break;

 			}

-			ofsThis=dbeNext->ofsNext;

-			dbeNext=(struct DBEvent*)DBRead(ofsThis,sizeof(struct DBEvent),NULL);

+			ofsThis = dbeNext->ofsNext;

+			dbeNext = (DBEvent*)DBRead(ofsThis,sizeof(DBEvent),NULL);

 			if (!(dbeNext->flags&(DBEF_READ|DBEF_SENT))) {

-				dbc.ofsFirstUnreadEvent=ofsThis;

-				dbc.timestampFirstUnread=dbeNext->timestamp;

+				dbc.ofsFirstUnreadEvent = ofsThis;

+				dbc.timestampFirstUnread = dbeNext->timestamp;

 				break;

 			}

 		}

 	}

 	//get previous and next events in chain and change offsets

-	if(dbe.flags&DBEF_FIRST) {

-		if(dbe.ofsNext==0) {

-			dbc.ofsFirstEvent=dbc.ofsLastEvent=0;

+	if (dbe.flags&DBEF_FIRST) {

+		if (dbe.ofsNext == 0) {

+			dbc.ofsFirstEvent = dbc.ofsLastEvent = 0;

 		}

 		else {

-			dbeNext=(struct DBEvent*)DBRead(dbe.ofsNext,sizeof(struct DBEvent),NULL);

-			dbeNext->flags|=DBEF_FIRST;

-			dbeNext->ofsPrev=dbe.ofsPrev;

-			DBWrite(dbe.ofsNext,dbeNext,sizeof(struct DBEvent));

-			dbc.ofsFirstEvent=dbe.ofsNext;

+			dbeNext = (DBEvent*)DBRead(dbe.ofsNext,sizeof(DBEvent),NULL);

+			dbeNext->flags |= DBEF_FIRST;

+			dbeNext->ofsPrev = dbe.ofsPrev;

+			DBWrite(dbe.ofsNext,dbeNext,sizeof(DBEvent));

+			dbc.ofsFirstEvent = dbe.ofsNext;

 		}

 	}

 	else {

-		if(dbe.ofsNext==0) {

-			dbePrev=(struct DBEvent*)DBRead(dbe.ofsPrev,sizeof(struct DBEvent),NULL);

-			dbePrev->ofsNext=0;

-			DBWrite(dbe.ofsPrev,dbePrev,sizeof(struct DBEvent));

-			dbc.ofsLastEvent=dbe.ofsPrev;

+		if (dbe.ofsNext == 0) {

+			dbePrev = (DBEvent*)DBRead(dbe.ofsPrev,sizeof(DBEvent),NULL);

+			dbePrev->ofsNext = 0;

+			DBWrite(dbe.ofsPrev,dbePrev,sizeof(DBEvent));

+			dbc.ofsLastEvent = dbe.ofsPrev;

 		}

 		else {

-			dbePrev=(struct DBEvent*)DBRead(dbe.ofsPrev,sizeof(struct DBEvent),NULL);

-			dbePrev->ofsNext=dbe.ofsNext;

-			DBWrite(dbe.ofsPrev,dbePrev,sizeof(struct DBEvent));

-			dbeNext=(struct DBEvent*)DBRead(dbe.ofsNext,sizeof(struct DBEvent),NULL);

-			dbeNext->ofsPrev=dbe.ofsPrev;

-			DBWrite(dbe.ofsNext,dbeNext,sizeof(struct DBEvent));

+			dbePrev = (DBEvent*)DBRead(dbe.ofsPrev,sizeof(DBEvent),NULL);

+			dbePrev->ofsNext = dbe.ofsNext;

+			DBWrite(dbe.ofsPrev,dbePrev,sizeof(DBEvent));

+			dbeNext = (DBEvent*)DBRead(dbe.ofsNext,sizeof(DBEvent),NULL);

+			dbeNext->ofsPrev = dbe.ofsPrev;

+			DBWrite(dbe.ofsNext,dbeNext,sizeof(DBEvent));

 		}

 	}

 	//delete event

-	DeleteSpace(lParam,offsetof(struct DBEvent,blob)+dbe.cbBlob);

+	DeleteSpace((DWORD)hDbEvent, offsetof(DBEvent,blob)+dbe.cbBlob);

 	//decrement event count

 	dbc.eventCount--;

-	DBWrite(ofsContact,&dbc,sizeof(struct DBContact));

+	DBWrite(ofsContact,&dbc,sizeof(DBContact));

 	DBFlush(0);

 	//quit

 	LeaveCriticalSection(&csDbAccess);

 	return 0;

 }

 

-static INT_PTR GetBlobSize(WPARAM wParam,LPARAM lParam)

+STDMETHODIMP_(LONG) CDdxMmap::GetBlobSize(HANDLE hDbEvent)

 {

 	INT_PTR ret;

-	struct DBEvent *dbe;

+	DBEvent *dbe;

 

 	EnterCriticalSection(&csDbAccess);

-	dbe=(struct DBEvent*)DBRead(wParam,sizeof(struct DBEvent),NULL);

-	if(dbe->signature!=DBEVENT_SIGNATURE) ret=-1;

-	else ret=dbe->cbBlob;

+	dbe = (DBEvent*)DBRead(hDbEvent, sizeof(DBEvent), NULL);

+	if (dbe->signature!=DBEVENT_SIGNATURE) ret = -1;

+	else ret = dbe->cbBlob;

 	LeaveCriticalSection(&csDbAccess);

 	return ret;

 }

 

-static INT_PTR GetEvent(WPARAM wParam,LPARAM lParam)

+STDMETHODIMP_(BOOL) CDdxMmap::GetEvent(HANDLE hDbEvent, DBEVENTINFO *dbei)

 {

-	struct DBEvent *dbe;

-	DBEVENTINFO *dbei=(DBEVENTINFO*)lParam;

+	DBEvent *dbe;

 	int bytesToCopy,i;

 

-	if(dbei==NULL||dbei->cbSize!=sizeof(DBEVENTINFO)) return 1;

-	if(dbei->cbBlob>0 && dbei->pBlob==NULL) {

+	if (dbei == NULL||dbei->cbSize!=sizeof(DBEVENTINFO)) return 1;

+	if (dbei->cbBlob>0 && dbei->pBlob == NULL) {

 		dbei->cbBlob = 0;

 		return 1;

 	}

 	EnterCriticalSection(&csDbAccess);

-	dbe=(struct DBEvent*)DBRead(wParam,sizeof(struct DBEvent),NULL);

-	if(dbe->signature!=DBEVENT_SIGNATURE) {

+	dbe = (DBEvent*)DBRead(hDbEvent,sizeof(DBEvent),NULL);

+	if (dbe->signature!=DBEVENT_SIGNATURE) {

 		LeaveCriticalSection(&csDbAccess);

 	  	return 1;

 	}

-	dbei->szModule=GetModuleNameByOfs(dbe->ofsModuleName);

-	dbei->timestamp=dbe->timestamp;

-	dbei->flags=dbe->flags;

-	dbei->eventType=dbe->eventType;

-	if(dbei->cbBlob<dbe->cbBlob) bytesToCopy=dbei->cbBlob;

-	else bytesToCopy=dbe->cbBlob;

-	dbei->cbBlob=dbe->cbBlob;

+	dbei->szModule = GetModuleNameByOfs(dbe->ofsModuleName);

+	dbei->timestamp = dbe->timestamp;

+	dbei->flags = dbe->flags;

+	dbei->eventType = dbe->eventType;

+	if (dbei->cbBlob<dbe->cbBlob) bytesToCopy = dbei->cbBlob;

+	else bytesToCopy = dbe->cbBlob;

+	dbei->cbBlob = dbe->cbBlob;

 	if (bytesToCopy && dbei->pBlob)

 	{

-		for(i=0;;i+=MAXCACHEDREADSIZE) {

-			if(bytesToCopy-i<=MAXCACHEDREADSIZE) {

-				CopyMemory(dbei->pBlob+i,DBRead(wParam+offsetof(struct DBEvent,blob)+i,bytesToCopy-i,NULL),bytesToCopy-i);

+		for(i = 0;;i += MAXCACHEDREADSIZE) {

+			if (bytesToCopy-i <= MAXCACHEDREADSIZE) {

+				CopyMemory(dbei->pBlob+i,DBRead(DWORD(hDbEvent)+offsetof(DBEvent,blob)+i,bytesToCopy-i,NULL),bytesToCopy-i);

 				break;

 			}

-			CopyMemory(dbei->pBlob+i,DBRead(wParam+offsetof(struct DBEvent,blob)+i,MAXCACHEDREADSIZE,NULL),MAXCACHEDREADSIZE);

+			CopyMemory(dbei->pBlob+i,DBRead(DWORD(hDbEvent)+offsetof(DBEvent,blob)+i,MAXCACHEDREADSIZE,NULL),MAXCACHEDREADSIZE);

 		}

 	}

 	LeaveCriticalSection(&csDbAccess);

 	return 0;

 }

 

-static INT_PTR MarkEventRead(WPARAM wParam,LPARAM lParam)

+STDMETHODIMP_(BOOL) CDdxMmap::MarkEventRead(HANDLE hContact, HANDLE hDbEvent)

 {

 	INT_PTR ret;

-	struct DBEvent *dbe;

-	struct DBContact dbc;

+	DBEvent *dbe;

+	DBContact dbc;

 	DWORD ofsThis;

 

 	EnterCriticalSection(&csDbAccess);

-	if(wParam==0) wParam=dbHeader.ofsUser;

-	dbc=*(struct DBContact*)DBRead(wParam,sizeof(struct DBContact),NULL);

-	dbe=(struct DBEvent*)DBRead(lParam,sizeof(struct DBEvent),NULL);

-	if(dbe->signature!=DBEVENT_SIGNATURE || dbc.signature!=DBCONTACT_SIGNATURE) {

+	if (hContact == 0)

+		hContact = (HANDLE)dbHeader.ofsUser;

+	dbc = *(DBContact*)DBRead(hContact,sizeof(DBContact),NULL);

+	dbe = (DBEvent*)DBRead(hDbEvent,sizeof(DBEvent),NULL);

+	if (dbe->signature!=DBEVENT_SIGNATURE || dbc.signature!=DBCONTACT_SIGNATURE) {

 		LeaveCriticalSection(&csDbAccess);

 	  	return -1;

 	}

-	if(dbe->flags&DBEF_READ || dbe->flags&DBEF_SENT) {

-		ret=(INT_PTR)dbe->flags;

+	if (dbe->flags&DBEF_READ || dbe->flags&DBEF_SENT) {

+		ret = (INT_PTR)dbe->flags;

 		LeaveCriticalSection(&csDbAccess);

 		return ret;

 	}

 	log1("mark read @ %08x",wParam);

-	dbe->flags|=DBEF_READ;

-	DBWrite(lParam,dbe,sizeof(struct DBEvent));

-	ret=(int)dbe->flags;

-	if(dbc.ofsFirstUnreadEvent==(DWORD)lParam) {

+	dbe->flags |= DBEF_READ;

+	DBWrite((DWORD)hDbEvent,dbe,sizeof(DBEvent));

+	ret = (int)dbe->flags;

+	if (dbc.ofsFirstUnreadEvent == (DWORD)hDbEvent) {

 		for (;;) {

-			if(dbe->ofsNext==0) {

-				dbc.ofsFirstUnreadEvent=0;

-				dbc.timestampFirstUnread=0;

+			if (dbe->ofsNext == 0) {

+				dbc.ofsFirstUnreadEvent = 0;

+				dbc.timestampFirstUnread = 0;

 				break;

 			}

-			ofsThis=dbe->ofsNext;

-			dbe=(struct DBEvent*)DBRead(ofsThis,sizeof(struct DBEvent),NULL);

+			ofsThis = dbe->ofsNext;

+			dbe = (DBEvent*)DBRead(ofsThis,sizeof(DBEvent),NULL);

 			if (!(dbe->flags&(DBEF_READ|DBEF_SENT))) {

-				dbc.ofsFirstUnreadEvent=ofsThis;

-				dbc.timestampFirstUnread=dbe->timestamp;

+				dbc.ofsFirstUnreadEvent = ofsThis;

+				dbc.timestampFirstUnread = dbe->timestamp;

 				break;

 			}

 		}

 	}

-	DBWrite(wParam,&dbc,sizeof(struct DBContact));

+	DBWrite((DWORD)hContact,&dbc,sizeof(DBContact));

 	DBFlush(0);

 	LeaveCriticalSection(&csDbAccess);

 	return ret;

 }

 

-static INT_PTR GetEventContact(WPARAM wParam,LPARAM lParam)

+STDMETHODIMP_(HANDLE) CDdxMmap::GetEventContact(HANDLE hDbEvent)

 {

-	int ret;

-	struct DBEvent *dbe;

-

 	EnterCriticalSection(&csDbAccess);

-	dbe=(struct DBEvent*)DBRead(wParam,sizeof(struct DBEvent),NULL);

-	if(dbe->signature!=DBEVENT_SIGNATURE) {

+	DBEvent *dbe = (DBEvent*)DBRead(hDbEvent,sizeof(DBEvent),NULL);

+	if (dbe->signature != DBEVENT_SIGNATURE) {

 		LeaveCriticalSection(&csDbAccess);

-	  	return -1;

+	  	return (HANDLE)-1;

 	}

-	while(!(dbe->flags&DBEF_FIRST))

-		dbe=(struct DBEvent*)DBRead(dbe->ofsPrev,sizeof(struct DBEvent),NULL);

-	ret=(INT_PTR)dbe->ofsPrev;

+	while(!(dbe->flags & DBEF_FIRST))

+		dbe = (DBEvent*)DBRead(dbe->ofsPrev,sizeof(DBEvent),NULL);

+	

+	HANDLE ret = (HANDLE)dbe->ofsPrev;

 	LeaveCriticalSection(&csDbAccess);

 	return ret;

 }

 

-static INT_PTR FindFirstEvent(WPARAM wParam,LPARAM lParam)

+STDMETHODIMP_(HANDLE) CDdxMmap::FindFirstEvent(HANDLE hContact)

 {

-	INT_PTR ret;

-	struct DBContact *dbc;

+	HANDLE ret;

 

 	EnterCriticalSection(&csDbAccess);

-	if(wParam==0) wParam=dbHeader.ofsUser;

-	dbc=(struct DBContact*)DBRead(wParam,sizeof(struct DBContact),NULL);

-	if(dbc->signature!=DBCONTACT_SIGNATURE) ret=0;

-	else ret=(INT_PTR)dbc->ofsFirstEvent;

+	if (hContact == 0)

+		hContact = (HANDLE)dbHeader.ofsUser;

+	

+	DBContact *dbc = (DBContact*)DBRead(hContact, sizeof(DBContact), NULL);

+	if (dbc->signature != DBCONTACT_SIGNATURE)

+		ret = 0;

+	else

+		ret = (HANDLE)dbc->ofsFirstEvent;

 	LeaveCriticalSection(&csDbAccess);

 	return ret;

 }

 

-static INT_PTR FindFirstUnreadEvent(WPARAM wParam,LPARAM lParam)

+STDMETHODIMP_(HANDLE) CDdxMmap::FindFirstUnreadEvent(HANDLE hContact)

 {

-	INT_PTR ret;

-	struct DBContact *dbc;

+	HANDLE ret;

 

 	EnterCriticalSection(&csDbAccess);

-	if(wParam==0) wParam=dbHeader.ofsUser;

-	dbc=(struct DBContact*)DBRead(wParam,sizeof(struct DBContact),NULL);

-	if(dbc->signature!=DBCONTACT_SIGNATURE) ret=0;

-	else ret=(INT_PTR)dbc->ofsFirstUnreadEvent;

+	if (hContact == 0)

+		hContact = (HANDLE)dbHeader.ofsUser;

+	DBContact *dbc = (DBContact*)DBRead(hContact,sizeof(DBContact),NULL);

+	if (dbc->signature!=DBCONTACT_SIGNATURE) ret = 0;

+	else ret = (HANDLE)dbc->ofsFirstUnreadEvent;

 	LeaveCriticalSection(&csDbAccess);

 	return ret;

 }

 

-static INT_PTR FindLastEvent(WPARAM wParam,LPARAM lParam)

+STDMETHODIMP_(HANDLE) CDdxMmap::FindLastEvent(HANDLE hContact)

 {

-	INT_PTR ret;

-	struct DBContact *dbc;

+	HANDLE ret;

 

 	EnterCriticalSection(&csDbAccess);

-	if(wParam==0) wParam=dbHeader.ofsUser;

-	dbc=(struct DBContact*)DBRead(wParam,sizeof(struct DBContact),NULL);

-	if(dbc->signature!=DBCONTACT_SIGNATURE) ret=0;

-	else ret=(INT_PTR)dbc->ofsLastEvent;

+	if (hContact == 0)

+		hContact = (HANDLE)dbHeader.ofsUser;

+	DBContact *dbc = (DBContact*)DBRead(hContact,sizeof(DBContact),NULL);

+	if (dbc->signature!=DBCONTACT_SIGNATURE) ret = 0;

+	else ret = (HANDLE)dbc->ofsLastEvent;

 	LeaveCriticalSection(&csDbAccess);

 	return ret;

 }

 

-static INT_PTR FindNextEvent(WPARAM wParam,LPARAM lParam)

+STDMETHODIMP_(HANDLE) CDdxMmap::FindNextEvent(HANDLE hDbEvent)

 {

-	INT_PTR ret;

-	struct DBEvent *dbe;

+	HANDLE ret;

 

 	EnterCriticalSection(&csDbAccess);

-	dbe=(struct DBEvent*)DBRead(wParam,sizeof(struct DBEvent),NULL);

-	if(dbe->signature!=DBEVENT_SIGNATURE) ret=0;

-	else ret=(INT_PTR)dbe->ofsNext;

+	DBEvent *dbe = (DBEvent*)DBRead(hDbEvent,sizeof(DBEvent),NULL);

+	if (dbe->signature!=DBEVENT_SIGNATURE) ret = 0;

+	else ret = (HANDLE)dbe->ofsNext;

 	LeaveCriticalSection(&csDbAccess);

 	return ret;

 }

 

-static INT_PTR FindPrevEvent(WPARAM wParam,LPARAM lParam)

+STDMETHODIMP_(HANDLE) CDdxMmap::FindPrevEvent(HANDLE hDbEvent)

 {

-	INT_PTR ret;

-	struct DBEvent *dbe;

+	HANDLE ret;

 

 	EnterCriticalSection(&csDbAccess);

-	dbe=(struct DBEvent*)DBRead(wParam,sizeof(struct DBEvent),NULL);

-	if(dbe->signature!=DBEVENT_SIGNATURE) ret=0;

-	else if(dbe->flags&DBEF_FIRST) ret=0;

-	else ret=(INT_PTR)dbe->ofsPrev;

+	DBEvent *dbe = (DBEvent*)DBRead(hDbEvent,sizeof(DBEvent),NULL);

+	if (dbe->signature!=DBEVENT_SIGNATURE) ret = 0;

+	else if (dbe->flags&DBEF_FIRST) ret = 0;

+	else ret = (HANDLE)dbe->ofsPrev;

 	LeaveCriticalSection(&csDbAccess);

 	return ret;

 }

@@ -415,28 +413,8 @@ static INT_PTR FindPrevEvent(WPARAM wParam,LPARAM lParam)
 

 int InitEvents(void)

 {

-	CreateServiceFunction(MS_DB_EVENT_GETCOUNT,GetEventCount);

-	CreateServiceFunction(MS_DB_EVENT_ADD,AddEvent);

-	CreateServiceFunction(MS_DB_EVENT_DELETE,DeleteEvent);

-	CreateServiceFunction(MS_DB_EVENT_GETBLOBSIZE,GetBlobSize);

-	CreateServiceFunction(MS_DB_EVENT_GET,GetEvent);

-	CreateServiceFunction(MS_DB_EVENT_MARKREAD,MarkEventRead);

-	CreateServiceFunction(MS_DB_EVENT_GETCONTACT,GetEventContact);

-	CreateServiceFunction(MS_DB_EVENT_FINDFIRST,FindFirstEvent);

-	CreateServiceFunction(MS_DB_EVENT_FINDFIRSTUNREAD,FindFirstUnreadEvent);

-	CreateServiceFunction(MS_DB_EVENT_FINDLAST,FindLastEvent);

-	CreateServiceFunction(MS_DB_EVENT_FINDNEXT,FindNextEvent);

-	CreateServiceFunction(MS_DB_EVENT_FINDPREV,FindPrevEvent);

-	

 	hEventAddedEvent = CreateHookableEvent(ME_DB_EVENT_ADDED);

 	hEventDeletedEvent = CreateHookableEvent(ME_DB_EVENT_DELETED);

 	hEventFilterAddedEvent = CreateHookableEvent(ME_DB_EVENT_FILTER_ADD);

 	return 0;

 }

-

-void UninitEvents(void)

-{

-	DestroyHookableEvent(hEventAddedEvent); hEventAddedEvent = 0;

-	DestroyHookableEvent(hEventDeletedEvent); hEventDeletedEvent = 0;

-	DestroyHookableEvent(hEventFilterAddedEvent); hEventFilterAddedEvent = 0;

-}

diff --git a/plugins/Db3x_mmap/dbheaders.cpp b/plugins/Db3x_mmap/dbheaders.cpp
index 6ae9b33002..a7eede6475 100644
--- a/plugins/Db3x_mmap/dbheaders.cpp
+++ b/plugins/Db3x_mmap/dbheaders.cpp
@@ -27,38 +27,38 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 

 int CreateDbHeaders(HANDLE hFile)

 {

-	struct DBContact user;

+	DBContact user;

 	DWORD bytesWritten;

 

 	CopyMemory(dbHeader.signature,&dbSignature,sizeof(dbHeader.signature));

-	dbHeader.version=DB_THIS_VERSION;

-	dbHeader.ofsFileEnd=sizeof(struct DBHeader);

-	dbHeader.slackSpace=0;

-	dbHeader.contactCount=0;

-	dbHeader.ofsFirstContact=0;

-	dbHeader.ofsFirstModuleName=0;

-	dbHeader.ofsUser=0;

+	dbHeader.version = DB_THIS_VERSION;

+	dbHeader.ofsFileEnd = sizeof(struct DBHeader);

+	dbHeader.slackSpace = 0;

+	dbHeader.contactCount = 0;

+	dbHeader.ofsFirstContact = 0;

+	dbHeader.ofsFirstModuleName = 0;

+	dbHeader.ofsUser = 0;

 	//create user

-	dbHeader.ofsUser=dbHeader.ofsFileEnd;

-	dbHeader.ofsFileEnd+=sizeof(struct DBContact);

+	dbHeader.ofsUser = dbHeader.ofsFileEnd;

+	dbHeader.ofsFileEnd += sizeof(DBContact);

 	SetFilePointer(hFile,0,NULL,FILE_BEGIN);

 	WriteFile(hFile,&dbHeader,sizeof(dbHeader),&bytesWritten,NULL);

-	user.signature=DBCONTACT_SIGNATURE;

-	user.ofsNext=0;

-	user.ofsFirstSettings=0;

-	user.eventCount=0;

-	user.ofsFirstEvent=user.ofsLastEvent=0;

+	user.signature = DBCONTACT_SIGNATURE;

+	user.ofsNext = 0;

+	user.ofsFirstSettings = 0;

+	user.eventCount = 0;

+	user.ofsFirstEvent = user.ofsLastEvent = 0;

 	SetFilePointer(hFile,dbHeader.ofsUser,NULL,FILE_BEGIN);

-	WriteFile(hFile,&user,sizeof(struct DBContact),&bytesWritten,NULL);

+	WriteFile(hFile,&user,sizeof(DBContact),&bytesWritten,NULL);

 	FlushFileBuffers(hFile);

 	return 0;

 }

 

 int CheckDbHeaders(struct DBHeader * hdr)

 {

-	if(memcmp(hdr->signature,&dbSignature,sizeof(hdr->signature))) return 1;

-	if(hdr->version!=DB_THIS_VERSION) return 2;

-	if(hdr->ofsUser==0) return 3;

+	if (memcmp(hdr->signature,&dbSignature,sizeof(hdr->signature))) return 1;

+	if (hdr->version!=DB_THIS_VERSION) return 2;

+	if (hdr->ofsUser == 0) return 3;

 	return 0;

 }

 

diff --git a/plugins/Db3x_mmap/dbmodulechain.cpp b/plugins/Db3x_mmap/dbmodulechain.cpp
index 5ad05b5abd..ce835c3f94 100644
--- a/plugins/Db3x_mmap/dbmodulechain.cpp
+++ b/plugins/Db3x_mmap/dbmodulechain.cpp
@@ -75,12 +75,12 @@ int InitModuleNames(void)
 	lOfs.sortFunc = (FSortFunc)OfsCompare;

 	lOfs.increment = 50;

 

-	ofsThis=dbHeader.ofsFirstModuleName;

-	dbmn=(struct DBModuleName*)DBRead(ofsThis,sizeof(struct DBModuleName),NULL);

+	ofsThis = dbHeader.ofsFirstModuleName;

+	dbmn = (struct DBModuleName*)DBRead(ofsThis,sizeof(struct DBModuleName),NULL);

 	while(ofsThis) {

-		if(dbmn->signature!=DBMODULENAME_SIGNATURE) DatabaseCorruption(NULL);

+		if (dbmn->signature != DBMODULENAME_SIGNATURE) DatabaseCorruption(NULL);

 

-		nameLen=dbmn->cbName;

+		nameLen = dbmn->cbName;

 

 		mod = (char*)HeapAlloc(hModHeap,0,nameLen+1);

 		CopyMemory(mod,DBRead(ofsThis+offsetof(struct DBModuleName,name),nameLen,NULL),nameLen);

@@ -88,10 +88,9 @@ int InitModuleNames(void)
 

 		AddToList(mod, nameLen, ofsThis);

 

-		ofsThis=dbmn->ofsNext;

-		dbmn=(struct DBModuleName*)DBRead(ofsThis,sizeof(struct DBModuleName),NULL);

+		ofsThis = dbmn->ofsNext;

+		dbmn = (struct DBModuleName*)DBRead(ofsThis,sizeof(struct DBModuleName),NULL);

 	}

-	CreateServiceFunction(MS_DB_MODULES_ENUM,EnumModuleNames);

 	return 0;

 }

 

@@ -131,17 +130,17 @@ DWORD GetModuleNameOfs(const char *szName)
 	DWORD ofsNew,ofsExisting;

 	char *mod;

 

-	ofsExisting=FindExistingModuleNameOfs(szName);

-	if(ofsExisting) return ofsExisting;

+	ofsExisting = FindExistingModuleNameOfs(szName);

+	if (ofsExisting) return ofsExisting;

 

 	nameLen = (int)strlen(szName);

 

 	//need to create the module name

-	ofsNew=CreateNewSpace(nameLen+offsetof(struct DBModuleName,name));

-	dbmn.signature=DBMODULENAME_SIGNATURE;

-	dbmn.cbName=nameLen;

-	dbmn.ofsNext=dbHeader.ofsFirstModuleName;

-	dbHeader.ofsFirstModuleName=ofsNew;

+	ofsNew = CreateNewSpace(nameLen+offsetof(struct DBModuleName,name));

+	dbmn.signature = DBMODULENAME_SIGNATURE;

+	dbmn.cbName = nameLen;

+	dbmn.ofsNext = dbHeader.ofsFirstModuleName;

+	dbHeader.ofsFirstModuleName = ofsNew;

 	DBWrite(0,&dbHeader,sizeof(dbHeader));

 	DBWrite(ofsNew,&dbmn,offsetof(struct DBModuleName,name));

 	DBWrite(ofsNew+offsetof(struct DBModuleName,name),(PVOID)szName,nameLen);

@@ -178,15 +177,15 @@ char *GetModuleNameByOfs(DWORD ofs)
 	return NULL;

 }

 

-static INT_PTR EnumModuleNames(WPARAM wParam,LPARAM lParam)

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

 {

-	int i;

 	int ret;

 	ModuleName *pmn;

-	for(i = 0; i < lMods.realCount; i++) {

+	for(int i = 0; i < lMods.realCount; i++) {

 		pmn = (ModuleName *)lMods.items[i];

-		ret=((DBMODULEENUMPROC)lParam)(pmn->name,pmn->ofs,wParam);

-		if(ret) return ret;

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

+		if (ret)

+			return ret;

 	}

 	return 0;

 }

diff --git a/plugins/Db3x_mmap/dbsettings.cpp b/plugins/Db3x_mmap/dbsettings.cpp
index 5bdc0707f6..d55f71d189 100644
--- a/plugins/Db3x_mmap/dbsettings.cpp
+++ b/plugins/Db3x_mmap/dbsettings.cpp
@@ -33,29 +33,29 @@ SortedList lContacts = {0};
 HANDLE hLastCachedContact = NULL;

 static DBCachedContactValueList *LastVL = NULL;

 

-static SortedList lSettings={0}, lGlobalSettings={0}, lResidentSettings={0};

+static SortedList lSettings = {0}, lGlobalSettings = {0}, lResidentSettings = {0};

 static HANDLE hSettingChangeEvent = NULL;

 

-static DWORD GetSettingsGroupOfsByModuleNameOfs(struct DBContact *dbc,DWORD ofsModuleName)

+static DWORD GetSettingsGroupOfsByModuleNameOfs(DBContact *dbc,DWORD ofsModuleName)

 {

 	struct DBContactSettings *dbcs;

 	DWORD ofsThis;

 

-	ofsThis=dbc->ofsFirstSettings;

+	ofsThis = dbc->ofsFirstSettings;

 	while(ofsThis) {

-		dbcs=(struct DBContactSettings*)DBRead(ofsThis,sizeof(struct DBContactSettings),NULL);

-		if(dbcs->signature!=DBCONTACTSETTINGS_SIGNATURE) DatabaseCorruption(NULL);

-		if(dbcs->ofsModuleName==ofsModuleName)

+		dbcs = (struct DBContactSettings*)DBRead(ofsThis,sizeof(struct DBContactSettings),NULL);

+		if (dbcs->signature!=DBCONTACTSETTINGS_SIGNATURE) DatabaseCorruption(NULL);

+		if (dbcs->ofsModuleName == ofsModuleName)

 			return ofsThis;

 

-		ofsThis=dbcs->ofsNext;

+		ofsThis = dbcs->ofsNext;

 	}

 	return 0;

 }

 

 static DWORD __inline GetSettingValueLength(PBYTE pSetting)

 {

-	if(pSetting[0]&DBVTF_VARIABLELENGTH) return 2+*(PWORD)(pSetting+1);

+	if (pSetting[0]&DBVTF_VARIABLELENGTH) return 2+*(PWORD)(pSetting+1);

 	return pSetting[0];

 }

 

@@ -75,7 +75,7 @@ static char* GetCachedSetting(const char *szModuleName,const char *szSettingName
 	char szFullName[512];

 

 	strcpy(szFullName+1,szModuleName);

-	szFullName[moduleNameLen+1]='/';

+	szFullName[moduleNameLen+1] = '/';

 	strcpy(szFullName+moduleNameLen+2,szSettingName);

 

 	if (lastsetting && strcmp(szFullName+1,lastsetting) == 0)

@@ -152,11 +152,11 @@ static DBVARIANT* GetCachedValuePtr( HANDLE hContact, char* szSetting, int bAllo
 		DBCachedContactValue *V, *V1;

 		DBCachedContactValueList VLtemp,*VL;

 

-		if (hLastCachedContact==hContact && LastVL) {

+		if (hLastCachedContact == hContact && LastVL) {

 			VL = LastVL;

 		}

 		else {

-			VLtemp.hContact=hContact;

+			VLtemp.hContact = hContact;

 

 			if ( !List_GetIndex(&lContacts,&VLtemp,&index))

 			{

@@ -210,12 +210,12 @@ static DBVARIANT* GetCachedValuePtr( HANDLE hContact, char* szSetting, int bAllo
 		return &V->value;

 }	}

 

-#define NeedBytes(n)   if(bytesRemaining<(n)) pBlob=(PBYTE)DBRead(ofsBlobPtr,(n),&bytesRemaining)

-#define MoveAlong(n)   {int x=n; pBlob+=(x); ofsBlobPtr+=(x); bytesRemaining-=(x);}

-#define VLT(n) ((n==DBVT_UTF8)?DBVT_ASCIIZ:n)

+#define NeedBytes(n)   if (bytesRemaining<(n)) pBlob = (PBYTE)DBRead(ofsBlobPtr,(n),&bytesRemaining)

+#define MoveAlong(n)   {int x = n; pBlob += (x); ofsBlobPtr += (x); bytesRemaining -= (x);}

+#define VLT(n) ((n == DBVT_UTF8)?DBVT_ASCIIZ:n)

 static __inline int GetContactSettingWorker(HANDLE hContact,DBCONTACTGETSETTING *dbcgs,int isStatic)

 {

-	struct DBContact *dbc;

+	DBContact *dbc;

 	DWORD ofsModuleName,ofsContact,ofsSettingsGroup,ofsBlobPtr;

 	int settingNameLen,moduleNameLen;

 	int bytesRemaining;

@@ -225,8 +225,8 @@ static __inline int GetContactSettingWorker(HANDLE hContact,DBCONTACTGETSETTING
 	if ((!dbcgs->szSetting) || (!dbcgs->szModule))

 		return 1;

 	// the db format can't tolerate more than 255 bytes of space (incl. null) for settings+module name

-	settingNameLen=(int)strlen(dbcgs->szSetting);

-	moduleNameLen=(int)strlen(dbcgs->szModule);

+	settingNameLen = (int)strlen(dbcgs->szSetting);

+	moduleNameLen = (int)strlen(dbcgs->szModule);

 	if ( settingNameLen > 0xFE )

 	{

 		#ifdef _DEBUG

@@ -261,10 +261,10 @@ static __inline int GetContactSettingWorker(HANDLE hContact,DBCONTACTGETSETTING
 

 					cbOrigLen--;

 					dbcgs->pValue->pszVal = cbOrigPtr;

-					if(cbLen<cbOrigLen) cbOrigLen=cbLen;

+					if (cbLen<cbOrigLen) cbOrigLen = cbLen;

 					CopyMemory(dbcgs->pValue->pszVal,pCachedValue->pszVal,cbOrigLen);

-					dbcgs->pValue->pszVal[cbOrigLen]=0;

-					dbcgs->pValue->cchVal=cbLen;

+					dbcgs->pValue->pszVal[cbOrigLen] = 0;

+					dbcgs->pValue->cchVal = cbLen;

 				}

 				else {

 					dbcgs->pValue->pszVal = (char*)mir_alloc(strlen(pCachedValue->pszVal)+1);

@@ -287,64 +287,64 @@ static __inline int GetContactSettingWorker(HANDLE hContact,DBCONTACTGETSETTING
 			return ( pCachedValue->type == DBVT_DELETED ) ? 1 : 0;

 	}	}

 

-	ofsModuleName=GetModuleNameOfs(dbcgs->szModule);

-	if(hContact==NULL) ofsContact=dbHeader.ofsUser;

-	else ofsContact=(DWORD)hContact;

-	dbc=(struct DBContact*)DBRead(ofsContact,sizeof(struct DBContact),NULL);

-	if(dbc->signature!=DBCONTACT_SIGNATURE) {

+	ofsModuleName = GetModuleNameOfs(dbcgs->szModule);

+	if (hContact == NULL) ofsContact = dbHeader.ofsUser;

+	else ofsContact = (DWORD)hContact;

+	dbc = (DBContact*)DBRead(ofsContact,sizeof(DBContact),NULL);

+	if (dbc->signature!=DBCONTACT_SIGNATURE) {

 		LeaveCriticalSection(&csDbAccess);

 		return 1;

 	}

-	ofsSettingsGroup=GetSettingsGroupOfsByModuleNameOfs(dbc,ofsModuleName);

-	if(ofsSettingsGroup) {

-		ofsBlobPtr=ofsSettingsGroup+offsetof(struct DBContactSettings,blob);

+	ofsSettingsGroup = GetSettingsGroupOfsByModuleNameOfs(dbc,ofsModuleName);

+	if (ofsSettingsGroup) {

+		ofsBlobPtr = ofsSettingsGroup+offsetof(struct DBContactSettings,blob);

 		pBlob = DBRead(ofsBlobPtr,sizeof(struct DBContactSettings),&bytesRemaining);

 		while(pBlob[0]) {

 			NeedBytes(1+settingNameLen);

-			if(pBlob[0]==settingNameLen && !memcmp(pBlob+1,dbcgs->szSetting,settingNameLen)) {

+			if (pBlob[0] == settingNameLen && !memcmp(pBlob+1,dbcgs->szSetting,settingNameLen)) {

 				MoveAlong(1+settingNameLen);

 				NeedBytes(5);

-				if(isStatic && pBlob[0]&DBVTF_VARIABLELENGTH && VLT(dbcgs->pValue->type) != VLT(pBlob[0])) {

+				if (isStatic && pBlob[0]&DBVTF_VARIABLELENGTH && VLT(dbcgs->pValue->type) != VLT(pBlob[0])) {

 					LeaveCriticalSection(&csDbAccess);

 					return 1;

 				}

-				dbcgs->pValue->type=pBlob[0];

+				dbcgs->pValue->type = pBlob[0];

 				switch(pBlob[0]) {

 					case DBVT_DELETED: { /* this setting is deleted */

-						dbcgs->pValue->type=DBVT_DELETED;

+						dbcgs->pValue->type = DBVT_DELETED;

 						LeaveCriticalSection(&csDbAccess);

 						return 2;

 					}

-					case DBVT_BYTE: dbcgs->pValue->bVal=pBlob[1]; break;

-					case DBVT_WORD: dbcgs->pValue->wVal=*(PWORD)(pBlob+1); break;

-					case DBVT_DWORD: dbcgs->pValue->dVal=*(PDWORD)(pBlob+1); break;

+					case DBVT_BYTE: dbcgs->pValue->bVal = pBlob[1]; break;

+					case DBVT_WORD: dbcgs->pValue->wVal = *(PWORD)(pBlob+1); break;

+					case DBVT_DWORD: dbcgs->pValue->dVal = *(PDWORD)(pBlob+1); break;

 					case DBVT_UTF8:

 					case DBVT_ASCIIZ:

 						NeedBytes(3+*(PWORD)(pBlob+1));

-						if(isStatic) {

+						if (isStatic) {

 							dbcgs->pValue->cchVal--;

-							if (*(PWORD)(pBlob+1)<dbcgs->pValue->cchVal) dbcgs->pValue->cchVal=*(PWORD)(pBlob+1);

+							if (*(PWORD)(pBlob+1)<dbcgs->pValue->cchVal) dbcgs->pValue->cchVal = *(PWORD)(pBlob+1);

 							CopyMemory(dbcgs->pValue->pszVal,pBlob+3,dbcgs->pValue->cchVal);

-							dbcgs->pValue->pszVal[dbcgs->pValue->cchVal]=0;

-							dbcgs->pValue->cchVal=*(PWORD)(pBlob+1);

+							dbcgs->pValue->pszVal[dbcgs->pValue->cchVal] = 0;

+							dbcgs->pValue->cchVal = *(PWORD)(pBlob+1);

 						}

 						else {

-							dbcgs->pValue->pszVal=(char*)mir_alloc(1+*(PWORD)(pBlob+1));

+							dbcgs->pValue->pszVal = (char*)mir_alloc(1+*(PWORD)(pBlob+1));

 							CopyMemory(dbcgs->pValue->pszVal,pBlob+3,*(PWORD)(pBlob+1));

-							dbcgs->pValue->pszVal[*(PWORD)(pBlob+1)]=0;

+							dbcgs->pValue->pszVal[*(PWORD)(pBlob+1)] = 0;

 						}

 						break;

 					case DBVT_BLOB:

 						NeedBytes(3+*(PWORD)(pBlob+1));

-						if(isStatic) {

-							if (*(PWORD)(pBlob+1)<dbcgs->pValue->cpbVal) dbcgs->pValue->cpbVal=*(PWORD)(pBlob+1);

+						if (isStatic) {

+							if (*(PWORD)(pBlob+1)<dbcgs->pValue->cpbVal) dbcgs->pValue->cpbVal = *(PWORD)(pBlob+1);

 							CopyMemory(dbcgs->pValue->pbVal,pBlob+3,dbcgs->pValue->cpbVal);

 						}

 						else {

-							dbcgs->pValue->pbVal=(BYTE *)mir_alloc(*(PWORD)(pBlob+1));

+							dbcgs->pValue->pbVal = (BYTE *)mir_alloc(*(PWORD)(pBlob+1));

 							CopyMemory(dbcgs->pValue->pbVal,pBlob+3,*(PWORD)(pBlob+1));

 						}

-						dbcgs->pValue->cpbVal=*(PWORD)(pBlob+1);

+						dbcgs->pValue->cpbVal = *(PWORD)(pBlob+1);

 						break;

 				}

 

@@ -380,11 +380,10 @@ static __inline int GetContactSettingWorker(HANDLE hContact,DBCONTACTGETSETTING
 	return 1;

 }

 

-static INT_PTR GetContactSetting(WPARAM wParam,LPARAM lParam)

+STDMETHODIMP_(BOOL) CDdxMmap::GetContactSetting(HANDLE hContact, DBCONTACTGETSETTING *dgs)

 {

-	DBCONTACTGETSETTING* dgs = ( DBCONTACTGETSETTING* )lParam;

 	dgs->pValue->type = 0;

-	if ( GetContactSettingWorker(( HANDLE )wParam, dgs, 0 ))

+	if ( GetContactSettingWorker(hContact, dgs, 0 ))

 		return 1;

 

 	if ( dgs->pValue->type == DBVT_UTF8 ) {

@@ -415,12 +414,11 @@ static INT_PTR GetContactSetting(WPARAM wParam,LPARAM lParam)
 	return 0;

 }

 

-static INT_PTR GetContactSettingStr(WPARAM wParam,LPARAM lParam)

+STDMETHODIMP_(BOOL) CDdxMmap::GetContactSettingStr(HANDLE hContact, DBCONTACTGETSETTING *dgs)

 {

-	DBCONTACTGETSETTING* dgs = (DBCONTACTGETSETTING*)lParam;

 	int iSaveType = dgs->pValue->type;

 

-	if ( GetContactSettingWorker(( HANDLE )wParam, dgs, 0 ))

+	if ( GetContactSettingWorker(hContact, dgs, 0 ))

 		return 1;

 

 	if ( iSaveType == 0 || iSaveType == dgs->pValue->type )

@@ -463,10 +461,9 @@ static INT_PTR GetContactSettingStr(WPARAM wParam,LPARAM lParam)
 	return 0;

 }

 

-INT_PTR GetContactSettingStatic(WPARAM wParam,LPARAM lParam)

+STDMETHODIMP_(BOOL) CDdxMmap::GetContactSettingStatic(HANDLE hContact, DBCONTACTGETSETTING *dgs)

 {

-	DBCONTACTGETSETTING* dgs = (DBCONTACTGETSETTING*)lParam;

-	if ( GetContactSettingWorker(( HANDLE )wParam, dgs, 1 ))

+	if ( GetContactSettingWorker(hContact, dgs, 1 ))

 		return 1;

 

 	if ( dgs->pValue->type == DBVT_UTF8 ) {

@@ -477,9 +474,8 @@ INT_PTR GetContactSettingStatic(WPARAM wParam,LPARAM lParam)
 	return 0;

 }

 

-static INT_PTR FreeVariant(WPARAM wParam,LPARAM lParam)

+STDMETHODIMP_(BOOL) CDdxMmap::FreeVariant(DBVARIANT *dbv)

 {

-	DBVARIANT *dbv=(DBVARIANT*)lParam;

 	if ( dbv == 0 ) return 1;

 	switch ( dbv->type ) {

 		case DBVT_ASCIIZ:

@@ -487,29 +483,29 @@ static INT_PTR FreeVariant(WPARAM wParam,LPARAM lParam)
 		case DBVT_WCHAR:

 		{

 			if ( dbv->pszVal ) mir_free(dbv->pszVal);

-			dbv->pszVal=0;

+			dbv->pszVal = 0;

 			break;

 		}

 		case DBVT_BLOB:

 		{

 			if ( dbv->pbVal ) mir_free(dbv->pbVal);

-			dbv->pbVal=0;

+			dbv->pbVal = 0;

 			break;

 		}

 	}

-	dbv->type=0;

+	dbv->type = 0;

 	return 0;

 }

 

-static INT_PTR SetSettingResident(WPARAM wParam,LPARAM lParam)

+STDMETHODIMP_(BOOL) CDdxMmap::SetSettingResident(BOOL bIsResident, const char *pszSettingName)

 {

-	size_t cbSettingNameLen = strlen(( char* )lParam) + 2;

+	size_t cbSettingNameLen = strlen(pszSettingName) + 2;

 	if (cbSettingNameLen  < 512)

 	{

 		char*  szSetting;

 		int    idx;

 		char  szTemp[512];

-		strcpy( szTemp+1, ( char* )lParam );

+		strcpy( szTemp+1, pszSettingName);

 

 		EnterCriticalSection(&csDbAccess);

 		if ( !List_GetIndex( &lSettings, szTemp, &idx ))

@@ -517,14 +513,14 @@ static INT_PTR SetSettingResident(WPARAM wParam,LPARAM lParam)
 		else

 			szSetting = (char *)lSettings.items[idx];

 

-		*szSetting = (char)wParam;

+		*szSetting = (char)bIsResident;

 

 		if ( !List_GetIndex( &lResidentSettings, szSetting+1, &idx ))

 		{

-			if (wParam)

+			if (bIsResident)

 				List_Insert(&lResidentSettings,szSetting+1,idx);

 		}

-		else if (!wParam)

+		else if (!bIsResident)

 			List_Remove(&lResidentSettings,idx);

 

 		LeaveCriticalSection(&csDbAccess);

@@ -532,26 +528,25 @@ static INT_PTR SetSettingResident(WPARAM wParam,LPARAM lParam)
 	return 0;

 }

 

-static INT_PTR WriteContactSetting(WPARAM wParam,LPARAM lParam)

+STDMETHODIMP_(BOOL) CDdxMmap::WriteContactSetting(HANDLE hContact, DBCONTACTWRITESETTING *dbcws)

 {

-	DBCONTACTWRITESETTING *dbcws=(DBCONTACTWRITESETTING*)lParam;

 	DBCONTACTWRITESETTING tmp;

-	struct DBContact dbc;

+	DBContact dbc;

 	DWORD ofsModuleName;

 	struct DBContactSettings dbcs;

 	PBYTE pBlob;

-	int settingNameLen=0;

-	int moduleNameLen=0;

-	int settingDataLen=0;

+	int settingNameLen = 0;

+	int moduleNameLen = 0;

+	int settingDataLen = 0;

 	int bytesRequired,bytesRemaining;

 	DWORD ofsContact,ofsSettingsGroup,ofsBlobPtr;

 

-	if (dbcws == NULL || dbcws->szSetting==NULL || dbcws->szModule==NULL )

+	if (dbcws == NULL || dbcws->szSetting == NULL || dbcws->szModule == NULL )

 		return 1;

 

 	// the db format can't tolerate more than 255 bytes of space (incl. null) for settings+module name

-	settingNameLen=(int)strlen(dbcws->szSetting);

-	moduleNameLen=(int)strlen(dbcws->szModule);

+	settingNameLen = (int)strlen(dbcws->szSetting);

+	moduleNameLen = (int)strlen(dbcws->szModule);

 	if ( settingNameLen > 0xFE )

 	{

 		#ifdef _DEBUG

@@ -583,7 +578,7 @@ static INT_PTR WriteContactSetting(WPARAM wParam,LPARAM lParam)
 		else return 1;

 	}

 

-	if(tmp.value.type!=DBVT_BYTE && tmp.value.type!=DBVT_WORD && tmp.value.type!=DBVT_DWORD && tmp.value.type!=DBVT_ASCIIZ && tmp.value.type!=DBVT_UTF8 && tmp.value.type!=DBVT_BLOB)

+	if (tmp.value.type!=DBVT_BYTE && tmp.value.type!=DBVT_WORD && tmp.value.type!=DBVT_DWORD && tmp.value.type!=DBVT_ASCIIZ && tmp.value.type!=DBVT_UTF8 && tmp.value.type!=DBVT_BLOB)

 		return 1;

 	if ((!tmp.szModule) || (!tmp.szSetting) || ((tmp.value.type == DBVT_ASCIIZ || tmp.value.type == DBVT_UTF8 )&& tmp.value.pszVal == NULL) || (tmp.value.type == DBVT_BLOB && tmp.value.pbVal == NULL))

 		return 1;

@@ -605,7 +600,7 @@ static INT_PTR WriteContactSetting(WPARAM wParam,LPARAM lParam)
 	{

 		char* szCachedSettingName = GetCachedSetting(tmp.szModule, tmp.szSetting, moduleNameLen, settingNameLen);

 		if ( tmp.value.type != DBVT_BLOB ) {

-			DBVARIANT* pCachedValue = GetCachedValuePtr((HANDLE)wParam, szCachedSettingName, 1);

+			DBVARIANT* pCachedValue = GetCachedValuePtr(hContact, szCachedSettingName, 1);

 			if ( pCachedValue != NULL ) {

 				BOOL bIsIdentical = FALSE;

 				if ( pCachedValue->type == tmp.value.type ) {

@@ -625,53 +620,53 @@ static INT_PTR WriteContactSetting(WPARAM wParam,LPARAM lParam)
 			}

 			if ( szCachedSettingName[-1] != 0 ) {

 				LeaveCriticalSection(&csDbAccess);

-				NotifyEventHooks(hSettingChangeEvent,wParam,(LPARAM)&tmp);

+				NotifyEventHooks(hSettingChangeEvent, (WPARAM)hContact, (LPARAM)&tmp);

 				return 0;

 			}

 		}

-		else GetCachedValuePtr((HANDLE)wParam, szCachedSettingName, -1);

+		else GetCachedValuePtr(hContact, szCachedSettingName, -1);

 	}

 

-	ofsModuleName=GetModuleNameOfs(tmp.szModule);

- 	if(wParam==0) ofsContact=dbHeader.ofsUser;

-	else ofsContact=wParam;

+	ofsModuleName = GetModuleNameOfs(tmp.szModule);

+ 	if (hContact == 0) ofsContact = dbHeader.ofsUser;

+	else ofsContact = (DWORD)hContact;

 

-	dbc=*(struct DBContact*)DBRead(ofsContact,sizeof(struct DBContact),NULL);

-	if(dbc.signature!=DBCONTACT_SIGNATURE) {

+	dbc = *(DBContact*)DBRead(ofsContact,sizeof(DBContact),NULL);

+	if (dbc.signature!=DBCONTACT_SIGNATURE) {

 		LeaveCriticalSection(&csDbAccess);

 		return 1;

 	}

 	log0("write setting");

 	//make sure the module group exists

-	ofsSettingsGroup=GetSettingsGroupOfsByModuleNameOfs(&dbc,ofsModuleName);

-	if(ofsSettingsGroup==0) {  //module group didn't exist - make it

-		if(tmp.value.type&DBVTF_VARIABLELENGTH) {

-		  if(tmp.value.type==DBVT_ASCIIZ || tmp.value.type==DBVT_UTF8) bytesRequired=(int)strlen(tmp.value.pszVal)+2;

-		  else if(tmp.value.type==DBVT_BLOB) bytesRequired=tmp.value.cpbVal+2;

+	ofsSettingsGroup = GetSettingsGroupOfsByModuleNameOfs(&dbc,ofsModuleName);

+	if (ofsSettingsGroup == 0) {  //module group didn't exist - make it

+		if (tmp.value.type&DBVTF_VARIABLELENGTH) {

+		  if (tmp.value.type == DBVT_ASCIIZ || tmp.value.type == DBVT_UTF8) bytesRequired = (int)strlen(tmp.value.pszVal)+2;

+		  else if (tmp.value.type == DBVT_BLOB) bytesRequired = tmp.value.cpbVal+2;

 		}

-		else bytesRequired=tmp.value.type;

-		bytesRequired+=2+settingNameLen;

-		bytesRequired+=(DB_SETTINGS_RESIZE_GRANULARITY-(bytesRequired%DB_SETTINGS_RESIZE_GRANULARITY))%DB_SETTINGS_RESIZE_GRANULARITY;

-		ofsSettingsGroup=CreateNewSpace(bytesRequired+offsetof(struct DBContactSettings,blob));

-		dbcs.signature=DBCONTACTSETTINGS_SIGNATURE;

-		dbcs.ofsNext=dbc.ofsFirstSettings;

-		dbcs.ofsModuleName=ofsModuleName;

-		dbcs.cbBlob=bytesRequired;

-		dbcs.blob[0]=0;

-		dbc.ofsFirstSettings=ofsSettingsGroup;

-		DBWrite(ofsContact,&dbc,sizeof(struct DBContact));

+		else bytesRequired = tmp.value.type;

+		bytesRequired += 2+settingNameLen;

+		bytesRequired += (DB_SETTINGS_RESIZE_GRANULARITY-(bytesRequired%DB_SETTINGS_RESIZE_GRANULARITY))%DB_SETTINGS_RESIZE_GRANULARITY;

+		ofsSettingsGroup = CreateNewSpace(bytesRequired+offsetof(struct DBContactSettings,blob));

+		dbcs.signature = DBCONTACTSETTINGS_SIGNATURE;

+		dbcs.ofsNext = dbc.ofsFirstSettings;

+		dbcs.ofsModuleName = ofsModuleName;

+		dbcs.cbBlob = bytesRequired;

+		dbcs.blob[0] = 0;

+		dbc.ofsFirstSettings = ofsSettingsGroup;

+		DBWrite(ofsContact,&dbc,sizeof(DBContact));

 		DBWrite(ofsSettingsGroup,&dbcs,sizeof(struct DBContactSettings));

-		ofsBlobPtr=ofsSettingsGroup+offsetof(struct DBContactSettings,blob);

-		pBlob=(PBYTE)DBRead(ofsBlobPtr,1,&bytesRemaining);

+		ofsBlobPtr = ofsSettingsGroup+offsetof(struct DBContactSettings,blob);

+		pBlob = (PBYTE)DBRead(ofsBlobPtr,1,&bytesRemaining);

 	}

 	else {

-		dbcs=*(struct DBContactSettings*)DBRead(ofsSettingsGroup,sizeof(struct DBContactSettings),&bytesRemaining);

+		dbcs = *(struct DBContactSettings*)DBRead(ofsSettingsGroup,sizeof(struct DBContactSettings),&bytesRemaining);

 		//find if the setting exists

-		ofsBlobPtr=ofsSettingsGroup+offsetof(struct DBContactSettings,blob);

-		pBlob=(PBYTE)DBRead(ofsBlobPtr,1,&bytesRemaining);

+		ofsBlobPtr = ofsSettingsGroup+offsetof(struct DBContactSettings,blob);

+		pBlob = (PBYTE)DBRead(ofsBlobPtr,1,&bytesRemaining);

 		while(pBlob[0]) {

 			NeedBytes(settingNameLen+1);

-			if(pBlob[0]==settingNameLen && !memcmp(pBlob+1,tmp.szSetting,settingNameLen))

+			if (pBlob[0] == settingNameLen && !memcmp(pBlob+1,tmp.szSetting,settingNameLen))

 				break;

 			NeedBytes(1);

 			MoveAlong(pBlob[0]+1);

@@ -679,18 +674,18 @@ static INT_PTR WriteContactSetting(WPARAM wParam,LPARAM lParam)
 			MoveAlong(1+GetSettingValueLength(pBlob));

 			NeedBytes(1);

 		}

-		if(pBlob[0]) {	 //setting already existed, and up to end of name is in cache

+		if (pBlob[0]) {	 //setting already existed, and up to end of name is in cache

 			MoveAlong(1+settingNameLen);

 			//if different type or variable length and length is different

 			NeedBytes(3);

-			if(pBlob[0]!=tmp.value.type || ((pBlob[0]==DBVT_ASCIIZ || pBlob[0]==DBVT_UTF8) && *(PWORD)(pBlob+1)!=strlen(tmp.value.pszVal)) || (pBlob[0]==DBVT_BLOB && *(PWORD)(pBlob+1)!=tmp.value.cpbVal)) {

+			if (pBlob[0]!=tmp.value.type || ((pBlob[0] == DBVT_ASCIIZ || pBlob[0] == DBVT_UTF8) && *(PWORD)(pBlob+1)!=strlen(tmp.value.pszVal)) || (pBlob[0] == DBVT_BLOB && *(PWORD)(pBlob+1)!=tmp.value.cpbVal)) {

 				//bin it

 				int nameLen,valLen;

 				DWORD ofsSettingToCut;

 				NeedBytes(3);

-				nameLen=1+settingNameLen;

-				valLen=1+GetSettingValueLength(pBlob);

-				ofsSettingToCut=ofsBlobPtr-nameLen;

+				nameLen = 1+settingNameLen;

+				valLen = 1+GetSettingValueLength(pBlob);

+				ofsSettingToCut = ofsBlobPtr-nameLen;

 				MoveAlong(valLen);

 				NeedBytes(1);

 				while(pBlob[0]) {

@@ -700,8 +695,8 @@ static INT_PTR WriteContactSetting(WPARAM wParam,LPARAM lParam)
 					NeedBytes(1);

 				}

 				DBMoveChunk(ofsSettingToCut,ofsSettingToCut+nameLen+valLen,ofsBlobPtr+1-ofsSettingToCut);

-				ofsBlobPtr-=nameLen+valLen;

-				pBlob=(PBYTE)DBRead(ofsBlobPtr,1,&bytesRemaining);

+				ofsBlobPtr -= nameLen+valLen;

+				pBlob = (PBYTE)DBRead(ofsBlobPtr,1,&bytesRemaining);

 			}

 			else {

 				//replace existing setting at pBlob

@@ -718,7 +713,7 @@ static INT_PTR WriteContactSetting(WPARAM wParam,LPARAM lParam)
 				DBFlush(1);

 				LeaveCriticalSection(&csDbAccess);

 				//notify

-				NotifyEventHooks(hSettingChangeEvent,wParam,(LPARAM)&tmp);

+				NotifyEventHooks(hSettingChangeEvent, (WPARAM)hContact, (LPARAM)&tmp);

 				return 0;

 			}

 		}

@@ -726,49 +721,49 @@ static INT_PTR WriteContactSetting(WPARAM wParam,LPARAM lParam)
 	//cannot do a simple replace, add setting to end of list

 	//pBlob already points to end of list

 	//see if it fits

-	if(tmp.value.type&DBVTF_VARIABLELENGTH) {

-	  if(tmp.value.type==DBVT_ASCIIZ || tmp.value.type==DBVT_UTF8) bytesRequired=(int)strlen(tmp.value.pszVal)+2;

-	  else if(tmp.value.type==DBVT_BLOB) bytesRequired=tmp.value.cpbVal+2;

+	if (tmp.value.type&DBVTF_VARIABLELENGTH) {

+	  if (tmp.value.type == DBVT_ASCIIZ || tmp.value.type == DBVT_UTF8) bytesRequired = (int)strlen(tmp.value.pszVal)+2;

+	  else if (tmp.value.type == DBVT_BLOB) bytesRequired = tmp.value.cpbVal+2;

 	}

-	else bytesRequired=tmp.value.type;

-	bytesRequired+=2+settingNameLen;

-	bytesRequired+=ofsBlobPtr+1-(ofsSettingsGroup+offsetof(struct DBContactSettings,blob));

+	else bytesRequired = tmp.value.type;

+	bytesRequired += 2+settingNameLen;

+	bytesRequired += ofsBlobPtr+1-(ofsSettingsGroup+offsetof(struct DBContactSettings,blob));

 	if ((DWORD)bytesRequired>dbcs.cbBlob) {

 		//doesn't fit: move entire group

 		struct DBContactSettings *dbcsPrev;

 		DWORD ofsDbcsPrev,ofsNew;

 

-		bytesRequired+=(DB_SETTINGS_RESIZE_GRANULARITY-(bytesRequired%DB_SETTINGS_RESIZE_GRANULARITY))%DB_SETTINGS_RESIZE_GRANULARITY;

+		bytesRequired += (DB_SETTINGS_RESIZE_GRANULARITY-(bytesRequired%DB_SETTINGS_RESIZE_GRANULARITY))%DB_SETTINGS_RESIZE_GRANULARITY;

 		//find previous group to change its offset

-		ofsDbcsPrev=dbc.ofsFirstSettings;

-		if(ofsDbcsPrev==ofsSettingsGroup) ofsDbcsPrev=0;

+		ofsDbcsPrev = dbc.ofsFirstSettings;

+		if (ofsDbcsPrev == ofsSettingsGroup) ofsDbcsPrev = 0;

 		else {

-			dbcsPrev=(struct DBContactSettings*)DBRead(ofsDbcsPrev,sizeof(struct DBContactSettings),NULL);

+			dbcsPrev = (struct DBContactSettings*)DBRead(ofsDbcsPrev,sizeof(struct DBContactSettings),NULL);

 			while(dbcsPrev->ofsNext!=ofsSettingsGroup) {

-				if(dbcsPrev->ofsNext==0) DatabaseCorruption(NULL);

-				ofsDbcsPrev=dbcsPrev->ofsNext;

-				dbcsPrev=(struct DBContactSettings*)DBRead(ofsDbcsPrev,sizeof(struct DBContactSettings),NULL);

+				if (dbcsPrev->ofsNext == 0) DatabaseCorruption(NULL);

+				ofsDbcsPrev = dbcsPrev->ofsNext;

+				dbcsPrev = (struct DBContactSettings*)DBRead(ofsDbcsPrev,sizeof(struct DBContactSettings),NULL);

 			}

 		}

 

 		//create the new one

-		ofsNew=ReallocSpace(ofsSettingsGroup, dbcs.cbBlob+offsetof(struct DBContactSettings,blob), bytesRequired+offsetof(struct DBContactSettings,blob));

+		ofsNew = ReallocSpace(ofsSettingsGroup, dbcs.cbBlob+offsetof(struct DBContactSettings,blob), bytesRequired+offsetof(struct DBContactSettings,blob));

 

-		dbcs.cbBlob=bytesRequired;

+		dbcs.cbBlob = bytesRequired;

 

 		DBWrite(ofsNew,&dbcs,offsetof(struct DBContactSettings,blob));

-		if(ofsDbcsPrev==0) {

-			dbc.ofsFirstSettings=ofsNew;

-			DBWrite(ofsContact,&dbc,sizeof(struct DBContact));

+		if (ofsDbcsPrev == 0) {

+			dbc.ofsFirstSettings = ofsNew;

+			DBWrite(ofsContact,&dbc,sizeof(DBContact));

 		}

 		else {

-			dbcsPrev=(struct DBContactSettings*)DBRead(ofsDbcsPrev,sizeof(struct DBContactSettings),NULL);

-			dbcsPrev->ofsNext=ofsNew;

+			dbcsPrev = (struct DBContactSettings*)DBRead(ofsDbcsPrev,sizeof(struct DBContactSettings),NULL);

+			dbcsPrev->ofsNext = ofsNew;

 			DBWrite(ofsDbcsPrev,dbcsPrev,offsetof(struct DBContactSettings,blob));

 		}

-		ofsBlobPtr+=ofsNew-ofsSettingsGroup;

-		ofsSettingsGroup=ofsNew;

-		pBlob=(PBYTE)DBRead(ofsBlobPtr,1,&bytesRemaining);

+		ofsBlobPtr += ofsNew-ofsSettingsGroup;

+		ofsSettingsGroup = ofsNew;

+		pBlob = (PBYTE)DBRead(ofsBlobPtr,1,&bytesRemaining);

 	}

 	//we now have a place to put it and enough space: make it

 	DBWrite(ofsBlobPtr,&settingNameLen,1);

@@ -782,7 +777,7 @@ static INT_PTR WriteContactSetting(WPARAM wParam,LPARAM lParam)
 		case DBVT_DWORD: DBWrite(ofsBlobPtr,&tmp.value.dVal,4); MoveAlong(4); break;

 		case DBVT_UTF8:

 		case DBVT_ASCIIZ:

-			{	int len=(int)strlen(tmp.value.pszVal);

+			{	int len = (int)strlen(tmp.value.pszVal);

 				DBWrite(ofsBlobPtr,&len,2);

 				DBWrite(ofsBlobPtr+2,tmp.value.pszVal,len);

 				MoveAlong(2+len);

@@ -794,32 +789,31 @@ static INT_PTR WriteContactSetting(WPARAM wParam,LPARAM lParam)
 			MoveAlong(2+tmp.value.cpbVal);

 			break;

 	}

-	{	BYTE zero=0;

+	{	BYTE zero = 0;

 		DBWrite(ofsBlobPtr,&zero,1);

 	}

 	//quit

 	DBFlush(1);

 	LeaveCriticalSection(&csDbAccess);

 	//notify

-	NotifyEventHooks(hSettingChangeEvent, wParam, (LPARAM)&tmp );

+	NotifyEventHooks(hSettingChangeEvent, (WPARAM)hContact, (LPARAM)&tmp );

 	return 0;

 }

 

-static INT_PTR DeleteContactSetting(WPARAM wParam,LPARAM lParam)

+STDMETHODIMP_(BOOL) CDdxMmap::DeleteContactSetting(HANDLE hContact, DBCONTACTGETSETTING *dbcgs)

 {

-	DBCONTACTGETSETTING *dbcgs=(DBCONTACTGETSETTING*)lParam;

-	struct DBContact *dbc;

+	DBContact *dbc;

 	DWORD ofsModuleName,ofsSettingsGroup,ofsBlobPtr;

 	PBYTE pBlob;

 	int settingNameLen,moduleNameLen,bytesRemaining;

 	char* szCachedSettingName;

-	WPARAM saveWparam = wParam;

+	WPARAM saveWparam = (WPARAM)hContact;

 

 	if ((!dbcgs->szModule) || (!dbcgs->szSetting))

 		return 1;

 	// the db format can't tolerate more than 255 bytes of space (incl. null) for settings+module name

-	settingNameLen=(int)strlen(dbcgs->szSetting);

-	moduleNameLen=(int)strlen(dbcgs->szModule);

+	settingNameLen = (int)strlen(dbcgs->szSetting);

+	moduleNameLen = (int)strlen(dbcgs->szModule);

 	if ( settingNameLen > 0xFE )

 	{

 		#ifdef _DEBUG

@@ -836,26 +830,27 @@ static INT_PTR DeleteContactSetting(WPARAM wParam,LPARAM lParam)
 	}

 

 	EnterCriticalSection(&csDbAccess);

-	ofsModuleName=GetModuleNameOfs(dbcgs->szModule);

- 	if(wParam==0) wParam=dbHeader.ofsUser;

+	ofsModuleName = GetModuleNameOfs(dbcgs->szModule);

+ 	if (hContact == 0)

+		hContact = (HANDLE)dbHeader.ofsUser;

 

-	dbc=(struct DBContact*)DBRead(wParam,sizeof(struct DBContact),NULL);

-	if(dbc->signature!=DBCONTACT_SIGNATURE) {

+	dbc = (DBContact*)DBRead(hContact,sizeof(DBContact),NULL);

+	if (dbc->signature!=DBCONTACT_SIGNATURE) {

 		LeaveCriticalSection(&csDbAccess);

 		return 1;

 	}

 	//make sure the module group exists

-	ofsSettingsGroup=GetSettingsGroupOfsByModuleNameOfs(dbc,ofsModuleName);

-	if(ofsSettingsGroup==0) {

+	ofsSettingsGroup = GetSettingsGroupOfsByModuleNameOfs(dbc,ofsModuleName);

+	if (ofsSettingsGroup == 0) {

 		LeaveCriticalSection(&csDbAccess);

 		return 1;

 	}

 	//find if the setting exists

-	ofsBlobPtr=ofsSettingsGroup+offsetof(struct DBContactSettings,blob);

-	pBlob=(PBYTE)DBRead(ofsBlobPtr,1,&bytesRemaining);

+	ofsBlobPtr = ofsSettingsGroup+offsetof(struct DBContactSettings,blob);

+	pBlob = (PBYTE)DBRead(ofsBlobPtr,1,&bytesRemaining);

 	while(pBlob[0]) {

 		NeedBytes(settingNameLen+1);

-		if(pBlob[0]==settingNameLen && !memcmp(pBlob+1,dbcgs->szSetting,settingNameLen))

+		if (pBlob[0] == settingNameLen && !memcmp(pBlob+1,dbcgs->szSetting,settingNameLen))

 			break;

 		NeedBytes(1);

 		MoveAlong(pBlob[0]+1);

@@ -872,9 +867,9 @@ static INT_PTR DeleteContactSetting(WPARAM wParam,LPARAM lParam)
 		DWORD ofsSettingToCut;

 		MoveAlong(1+settingNameLen);

 		NeedBytes(3);

-		nameLen=1+settingNameLen;

-		valLen=1+GetSettingValueLength(pBlob);

-		ofsSettingToCut=ofsBlobPtr-nameLen;

+		nameLen = 1+settingNameLen;

+		valLen = 1+GetSettingValueLength(pBlob);

+		ofsSettingToCut = ofsBlobPtr-nameLen;

 		MoveAlong(valLen);

 		NeedBytes(1);

 		while(pBlob[0]) {

@@ -893,19 +888,18 @@ static INT_PTR DeleteContactSetting(WPARAM wParam,LPARAM lParam)
 	DBFlush(1);

 	LeaveCriticalSection(&csDbAccess);

 	{	//notify

-		DBCONTACTWRITESETTING dbcws={0};

-		dbcws.szModule=dbcgs->szModule;

-		dbcws.szSetting=dbcgs->szSetting;

-		dbcws.value.type=DBVT_DELETED;

+		DBCONTACTWRITESETTING dbcws = {0};

+		dbcws.szModule = dbcgs->szModule;

+		dbcws.szSetting = dbcgs->szSetting;

+		dbcws.value.type = DBVT_DELETED;

 		NotifyEventHooks(hSettingChangeEvent,saveWparam,(LPARAM)&dbcws);

 	}

 	return 0;

 }

 

-static INT_PTR EnumContactSettings(WPARAM wParam,LPARAM lParam)

+STDMETHODIMP_(BOOL) CDdxMmap::EnumContactSettings(HANDLE hContact, DBCONTACTENUMSETTINGS* dbces)

 {

-	DBCONTACTENUMSETTINGS *dbces=(DBCONTACTENUMSETTINGS*)lParam;

-	struct DBContact *dbc;

+	DBContact *dbc;

 	DWORD ofsModuleName,ofsContact,ofsBlobPtr;

 	int bytesRemaining, result;

 	PBYTE pBlob;

@@ -916,22 +910,22 @@ static INT_PTR EnumContactSettings(WPARAM wParam,LPARAM lParam)
 

 	EnterCriticalSection(&csDbAccess);

 

-	ofsModuleName=GetModuleNameOfs(dbces->szModule);

-	if(wParam==0) ofsContact=dbHeader.ofsUser;

-	else ofsContact=wParam;

-	dbc=(struct DBContact*)DBRead(ofsContact,sizeof(struct DBContact),NULL);

-	if(dbc->signature!=DBCONTACT_SIGNATURE) {

+	ofsModuleName = GetModuleNameOfs(dbces->szModule);

+	if (hContact == 0) ofsContact = dbHeader.ofsUser;

+	else ofsContact = (DWORD)hContact;

+	dbc = (DBContact*)DBRead(ofsContact,sizeof(DBContact),NULL);

+	if (dbc->signature != DBCONTACT_SIGNATURE) {

 		LeaveCriticalSection(&csDbAccess);

 		return -1;

 	}

-	dbces->ofsSettings=GetSettingsGroupOfsByModuleNameOfs(dbc,ofsModuleName);

+	dbces->ofsSettings = GetSettingsGroupOfsByModuleNameOfs(dbc,ofsModuleName);

 	if (!dbces->ofsSettings) {

 		LeaveCriticalSection(&csDbAccess);

 		return -1;

 	}

-	ofsBlobPtr=dbces->ofsSettings+offsetof(struct DBContactSettings,blob);

-	pBlob=(PBYTE)DBRead(ofsBlobPtr,1,&bytesRemaining);

-	if(pBlob[0]==0) {

+	ofsBlobPtr = dbces->ofsSettings+offsetof(struct DBContactSettings,blob);

+	pBlob = (PBYTE)DBRead(ofsBlobPtr,1,&bytesRemaining);

+	if (pBlob[0] == 0) {

 		LeaveCriticalSection(&csDbAccess);

 		return -1;

 	}

@@ -939,7 +933,7 @@ static INT_PTR EnumContactSettings(WPARAM wParam,LPARAM lParam)
 	while(pBlob[0]) {

 		NeedBytes(1);

 		NeedBytes(1+pBlob[0]);

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

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

 		result = (dbces->pfnEnumProc)(szSetting,dbces->lParam);

 		MoveAlong(1+pBlob[0]);

 		NeedBytes(3);

@@ -950,13 +944,11 @@ static INT_PTR EnumContactSettings(WPARAM wParam,LPARAM lParam)
 	return result;

 }

 

-static INT_PTR EnumResidentSettings(WPARAM wParam,LPARAM lParam)

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

 {

-	int i;

-	int ret;

-	for(i = 0; i < lResidentSettings.realCount; i++) {

-		ret=((DBMODULEENUMPROC)lParam)((char *)lResidentSettings.items[i], 0, wParam);

-		if(ret) return ret;

+	for(int i = 0; i < lResidentSettings.realCount; i++) {

+		int ret = pFunc((char *)lResidentSettings.items[i], 0, (LPARAM)pParam);

+		if (ret) return ret;

 	}

 	return 0;

 }

@@ -977,16 +969,6 @@ static int stringCompare2( char* p1, char* p2 )
 

 int InitSettings(void)

 {

-	CreateServiceFunction(MS_DB_CONTACT_GETSETTING,GetContactSetting);

-	CreateServiceFunction(MS_DB_CONTACT_GETSETTING_STR,GetContactSettingStr);

-	CreateServiceFunction(MS_DB_CONTACT_GETSETTINGSTATIC,GetContactSettingStatic);

-	CreateServiceFunction(MS_DB_CONTACT_FREEVARIANT,FreeVariant);

-	CreateServiceFunction(MS_DB_CONTACT_WRITESETTING,WriteContactSetting);

-	CreateServiceFunction(MS_DB_CONTACT_DELETESETTING,DeleteContactSetting);

-	CreateServiceFunction(MS_DB_CONTACT_ENUMSETTINGS,EnumContactSettings);

-	CreateServiceFunction(MS_DB_SETSETTINGRESIDENT,SetSettingResident);

-	CreateServiceFunction("DB/ResidentSettings/Enum",EnumResidentSettings);

-

 	hSettingChangeEvent = CreateHookableEvent(ME_DB_CONTACT_SETTINGCHANGED);

 

 	hCacheHeap = HeapCreate(0, 0, 0);

diff --git a/plugins/Db3x_mmap/encrypt.cpp b/plugins/Db3x_mmap/encrypt.cpp
deleted file mode 100644
index a42d79eae2..0000000000
--- a/plugins/Db3x_mmap/encrypt.cpp
+++ /dev/null
@@ -1,66 +0,0 @@
-/*

-

-Miranda IM: the free IM client for Microsoft* Windows*

-

-Copyright 2000-2003 Miranda ICQ/IM project,

-all portions of this codebase are copyrighted to the people

-listed in contributors.txt.

-

-This program is free software; you can redistribute it and/or

-modify it under the terms of the GNU General Public License

-as published by the Free Software Foundation; either version 2

-of the License, or (at your option) any later version.

-

-This program is distributed in the hope that it will be useful,

-but WITHOUT ANY WARRANTY; without even the implied warranty of

-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

-GNU General Public License for more details.

-

-You should have received a copy of the GNU General Public License

-along with this program; if not, write to the Free Software

-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

-*/

-

-#include "commonheaders.h"

-

-//VERY VERY VERY BASIC ENCRYPTION FUNCTION

-

-

-void Encrypt(char*msg,BOOL up)

-{

-	int i;

-	int jump;

-	if (up)

-	{

-		jump=5;

-	}

-	else

-	{

-		jump=-5;

-	}

-

-	for (i=0;msg[i];i++)

-	{

-			msg[i]=msg[i]+jump;

-	}

-

-}

-

-static INT_PTR EncodeString(WPARAM wParam,LPARAM lParam)

-{

-	Encrypt((char*)lParam,TRUE);

-	return 0;

-}

-

-static INT_PTR DecodeString(WPARAM wParam,LPARAM lParam)

-{

-	Encrypt((char*)lParam,FALSE);

-	return 0;

-}

-

-int InitCrypt(void)

-{

-	CreateServiceFunction(MS_DB_CRYPT_ENCODESTRING,EncodeString);

-	CreateServiceFunction(MS_DB_CRYPT_DECODESTRING,DecodeString);

-	return 0;

-}

diff --git a/plugins/Db3x_mmap/encryption.h b/plugins/Db3x_mmap/encryption.h
deleted file mode 100644
index 73c2d7e13a..0000000000
--- a/plugins/Db3x_mmap/encryption.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*

-Miranda ICQ: the free icq client for MS Windows 

-Copyright (C) 2000-2  Richard Hughes, Roland Rabien & Tristan Van de Vreede

-

-This program is free software; you can redistribute it and/or

-modify it under the terms of the GNU General Public License

-as published by the Free Software Foundation; either version 2

-of the License, or (at your option) any later version.

-

-This program is distributed in the hope that it will be useful,

-but WITHOUT ANY WARRANTY; without even the implied warranty of

-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

-GNU General Public License for more details.

-

-You should have received a copy of the GNU General Public License

-along with this program; if not, write to the Free Software

-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

-*/

-#ifndef MODULAR

-#include <windows.h>

-

-void Encrypt(char*msg,BOOL up);

-#endif 
\ No newline at end of file
diff --git a/plugins/Db3x_mmap/init.cpp b/plugins/Db3x_mmap/init.cpp
index dbb83d76ab..b655e61499 100644
--- a/plugins/Db3x_mmap/init.cpp
+++ b/plugins/Db3x_mmap/init.cpp
@@ -25,15 +25,18 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 

 int hLangpack;

 

-extern char szDbPath[MAX_PATH];

+extern TCHAR szDbPath[MAX_PATH];

 

-static PLUGININFOEX pluginInfo = {

+CDdxMmap* g_Db = NULL;

+

+static PLUGININFOEX pluginInfo =

+{

 	sizeof(PLUGININFOEX),

 	"Miranda mmap database driver",

 	__VERSION_DWORD,

 	"Provides Miranda database support: global settings, contacts, history, settings per contact.",

 	"Miranda-IM project",

-	"bio@msx.ru; ghazan@miranda-im.org",

+	"bio@msx.ru; ghazan@miranda.im",

 	"Copyright 2000-2011 Miranda IM project",

 	"",

 	UNICODE_AWARE,

@@ -48,43 +51,43 @@ static int getCapability( int flag )
 }

 

 // returns 0 if the profile is created, EMKPRF*

-static int makeDatabase(char * profile, int * error)

+static int makeDatabase(TCHAR *profile, int *error)

 {

-	HANDLE hFile = CreateFileA(profile, GENERIC_READ|GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, NULL);

+	HANDLE hFile = CreateFile(profile, GENERIC_READ|GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, NULL);

 	if ( hFile != INVALID_HANDLE_VALUE ) {

 		CreateDbHeaders(hFile);

 		CloseHandle(hFile);

 		return 0;

 	}

-	if ( error != NULL ) *error=EMKPRF_CREATEFAILED;

+	if ( error != NULL ) *error = EMKPRF_CREATEFAILED;

 	return 1;

 }

 

 // returns 0 if the given profile has a valid header

-static int grokHeader( char * profile, int * error )

+static int grokHeader(TCHAR *profile, int *error)

 {

-	int rc=1;

-	int chk=0;

+	int rc = 1;

+	int chk = 0;

 	struct DBHeader hdr;

 	HANDLE hFile = INVALID_HANDLE_VALUE;

-	DWORD dummy=0;

+	DWORD dummy = 0;

 

-	hFile = CreateFileA(profile, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL);

+	hFile = CreateFile(profile, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL);

 	if ( hFile == INVALID_HANDLE_VALUE ) {

-		if ( error != NULL ) *error=EGROKPRF_CANTREAD;

+		if ( error != NULL ) *error = EGROKPRF_CANTREAD;

 		return 1;

 	}

 	// read the header, which can fail (for various reasons)

 	if ( !ReadFile(hFile, &hdr, sizeof(struct DBHeader), &dummy, NULL)) {

-		if ( error != NULL) *error=EGROKPRF_CANTREAD;

+		if ( error != NULL) *error = EGROKPRF_CANTREAD;

 		CloseHandle(hFile);

 		return 1;

 	}

-	chk=CheckDbHeaders(&hdr);

+	chk = CheckDbHeaders(&hdr);

 	if ( chk == 0 ) {

 		// all the internal tests passed, hurrah

-		rc=0;

-		if ( error != NULL ) *error=0;

+		rc = 0;

+		if ( error != NULL ) *error = 0;

 	} else {

 		// didn't pass at all, or some did.

 		switch ( chk ) {

@@ -97,13 +100,13 @@ static int grokHeader( char * profile, int * error )
 			case 2:

 			{

 				// header was present, but version information newer

-				if ( error != NULL ) *error= EGROKPRF_VERNEWER;

+				if ( error != NULL ) *error =  EGROKPRF_VERNEWER;

 				break;

 			}

 			case 3:

 			{

 				// header/version OK, internal data missing

-				if ( error != NULL ) *error=EGROKPRF_DAMAGED;

+				if ( error != NULL ) *error = EGROKPRF_DAMAGED;

 				break;

 			}

 		} // switch

@@ -113,16 +116,21 @@ static int grokHeader( char * profile, int * error )
 }

 

 // returns 0 if all the APIs are injected otherwise, 1

-static int LoadDatabase(char * profile)

+static MIDatabase* LoadDatabase(TCHAR *profile)

 {

+	if (g_Db) delete g_Db;

+	g_Db = new CDdxMmap(profile);

+

 	// don't need thread notifications

-	strncpy(szDbPath, profile, sizeof(szDbPath));

+	_tcsncpy(szDbPath, profile, SIZEOF(szDbPath));

 

 	// set the memory, lists & UTF8 manager

 	mir_getLP( &pluginInfo );

 

 	// inject all APIs and hooks into the core

-	return LoadDatabaseModule();

+	LoadDatabaseModule();

+

+	return g_Db;

 }

 

 static int UnloadDatabase(int wasLoaded)

@@ -132,9 +140,9 @@ static int UnloadDatabase(int wasLoaded)
 	return 0;

 }

 

-static int getFriendlyName( char * buf, size_t cch, int shortName )

+static int getFriendlyName( TCHAR *buf, size_t cch, int shortName )

 {

-	strncpy(buf,shortName ? "db3x mmap driver" : "db3x mmap database support",cch);

+	_tcsncpy(buf,shortName ? _T("db3x mmap driver") : _T("db3x mmap database support"), cch);

 	return 0;

 }

 

@@ -150,7 +158,7 @@ static DATABASELINK dblink = {
 

 BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD dwReason, LPVOID reserved)

 {

-	g_hInst=hInstDLL;

+	g_hInst = hInstDLL;

 	return TRUE;

 }

 

@@ -174,4 +182,4 @@ extern "C" __declspec(dllexport) int Load(void)
 extern "C" __declspec(dllexport) int Unload(void)

 {

 	return 0;

-}
\ No newline at end of file
+}