- microkernel addded;

- version bumped to 0.92.2

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

3 files changed, 29 insertions, 29 deletions

diff --git a/plugins/Db3x_mmap/dbcontacts.cpp b/plugins/Db3x_mmap/dbcontacts.cpp
index 51e533266d..0afd3469ab 100644
--- a/plugins/Db3x_mmap/dbcontacts.cpp
+++ b/plugins/Db3x_mmap/dbcontacts.cpp
@@ -62,8 +62,8 @@ DBCachedContactValueList* AddToCachedContactList(HANDLE hContact, int index)
 	DBCachedContactValueList* VL;

 	VL = (DBCachedContactValueList*)HeapAlloc(hCacheHeap,HEAP_ZERO_MEMORY,sizeof(DBCachedContactValueList));

 	VL->hContact = hContact;

-	if (index == -1) li.List_GetIndex(&lContacts,VL,&index);

-	li.List_Insert(&lContacts,VL,index);

+	if (index == -1) List_GetIndex(&lContacts,VL,&index);

+	List_Insert(&lContacts,VL,index);

 	return VL;

 }

 

@@ -115,7 +115,7 @@ static INT_PTR FindNextContact(WPARAM wParam,LPARAM lParam)
 	VLtemp.hContact = (HANDLE)wParam;

 	EnterCriticalSection(&csDbAccess);

 	while(VLtemp.hContact) {

-		if ( li.List_GetIndex(&lContacts,&VLtemp,&index)) {

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

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

 			if (VL->hNext != NULL) {

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

@@ -174,7 +174,7 @@ static INT_PTR DeleteContact(WPARAM wParam,LPARAM lParam)
 

 	{	DBCachedContactValueList VLtemp;

 		VLtemp.hContact = (HANDLE)wParam;

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

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

 		{

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

 			DBCachedContactValue* V = VL->first;

@@ -188,7 +188,7 @@ static INT_PTR DeleteContact(WPARAM wParam,LPARAM lParam)
 

 			if (VLtemp.hContact == hLastCachedContact)

 				hLastCachedContact = NULL;

-			li.List_Remove(&lContacts,index);

+			List_Remove(&lContacts,index);

 	}	}

 

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

@@ -229,7 +229,7 @@ static INT_PTR DeleteContact(WPARAM wParam,LPARAM lParam)
 		{

 			DBCachedContactValueList VLtemp;

 			VLtemp.hContact = (HANDLE)ofsThis;

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

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

 			{

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

 				VL->hNext = ( HANDLE )ofsNext;

@@ -285,7 +285,7 @@ static INT_PTR IsDbContact(WPARAM wParam,LPARAM lParam)
 		int index;

 		DBCachedContactValueList VLtemp;

 		VLtemp.hContact = (HANDLE)wParam;

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

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

 			ret = TRUE;

 		else {

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

diff --git a/plugins/Db3x_mmap/dbmodulechain.cpp b/plugins/Db3x_mmap/dbmodulechain.cpp
index 671a239d48..5ad05b5abd 100644
--- a/plugins/Db3x_mmap/dbmodulechain.cpp
+++ b/plugins/Db3x_mmap/dbmodulechain.cpp
@@ -50,15 +50,15 @@ void AddToList(char *name, DWORD len, DWORD ofs)
 	mn->name = name;

 	mn->ofs = ofs;

 

-	if (li.List_GetIndex(&lMods,mn,&index))

+	if (List_GetIndex(&lMods,mn,&index))

 		DatabaseCorruption( _T("%s (Module Name not unique)"));

 

-	li.List_Insert(&lMods,mn,index);

+	List_Insert(&lMods,mn,index);

 

-	if (li.List_GetIndex(&lOfs,mn,&index))

+	if (List_GetIndex(&lOfs,mn,&index))

 		DatabaseCorruption( _T("%s (Module Offset not unique)"));

 

-	li.List_Insert(&lOfs,mn,index);

+	List_Insert(&lOfs,mn,index);

 }

 

 

@@ -98,8 +98,8 @@ int InitModuleNames(void)
 void UninitModuleNames(void)

 {

 	HeapDestroy(hModHeap);

-	li.List_Destroy(&lMods);

-	li.List_Destroy(&lOfs);

+	List_Destroy(&lMods);

+	List_Destroy(&lOfs);

 }

 

 static DWORD FindExistingModuleNameOfs(const char *szName)

@@ -114,7 +114,7 @@ static DWORD FindExistingModuleNameOfs(const char *szName)
 	if (lastmn && ModCompare(&mn,lastmn) == 0)

 		return lastmn->ofs;

 

-	if (li.List_GetIndex(&lMods,&mn,&index)) {

+	if (List_GetIndex(&lMods,&mn,&index)) {

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

 		lastmn = pmn;

 		return pmn->ofs;

@@ -168,7 +168,7 @@ char *GetModuleNameByOfs(DWORD ofs)
 	mn.name = NULL;

 	mn.ofs = ofs;

 

-	if (li.List_GetIndex(&lOfs,&mn,&index)) {

+	if (List_GetIndex(&lOfs,&mn,&index)) {

 		pmn = (ModuleName*)lOfs.items[index];

 		lastmn = pmn;

 		return pmn->name;

diff --git a/plugins/Db3x_mmap/dbsettings.cpp b/plugins/Db3x_mmap/dbsettings.cpp
index 90dfecd727..7f7687ab4c 100644
--- a/plugins/Db3x_mmap/dbsettings.cpp
+++ b/plugins/Db3x_mmap/dbsettings.cpp
@@ -64,7 +64,7 @@ static char* InsertCachedSetting( const char* szName, size_t cbNameLen, int inde
 	char* newValue = (char*)HeapAlloc( hCacheHeap, 0, cbNameLen );

 	*newValue = 0;

 	strcpy(newValue+1,szName+1);

-	li.List_Insert(&lSettings,newValue,index);

+	List_Insert(&lSettings,newValue,index);

 	return newValue;

 }

 

@@ -81,7 +81,7 @@ static char* GetCachedSetting(const char *szModuleName,const char *szSettingName
 	if (lastsetting && strcmp(szFullName+1,lastsetting) == 0)

 		return lastsetting;

 

-	if (li.List_GetIndex(&lSettings,szFullName,&index))

+	if (List_GetIndex(&lSettings,szFullName,&index))

 		lastsetting = (char*)lSettings.items[index]+1;

 	else

 		lastsetting = InsertCachedSetting( szFullName, settingNameLen+moduleNameLen+3, index )+1;

@@ -129,11 +129,11 @@ static DBVARIANT* GetCachedValuePtr( HANDLE hContact, char* szSetting, int bAllo
 	if ( hContact == 0 ) {

 		DBCachedGlobalValue Vtemp, *V;

 		Vtemp.name = szSetting;

-		if ( li.List_GetIndex(&lGlobalSettings,&Vtemp,&index)) {

+		if ( List_GetIndex(&lGlobalSettings,&Vtemp,&index)) {

 			V = (DBCachedGlobalValue*)lGlobalSettings.items[index];

 			if ( bAllocate == -1 ) {

 				FreeCachedVariant( &V->value );

-				li.List_Remove(&lGlobalSettings,index);

+				List_Remove(&lGlobalSettings,index);

 				HeapFree(hCacheHeap,0,V);

 				return NULL;

 		}	}

@@ -143,7 +143,7 @@ static DBVARIANT* GetCachedValuePtr( HANDLE hContact, char* szSetting, int bAllo
 

 			V = (DBCachedGlobalValue*)HeapAlloc(hCacheHeap,HEAP_ZERO_MEMORY,sizeof(DBCachedGlobalValue));

 			V->name = szSetting;

-			li.List_Insert(&lGlobalSettings,V,index);

+			List_Insert(&lGlobalSettings,V,index);

 		}

 

 		return &V->value;

@@ -158,7 +158,7 @@ static DBVARIANT* GetCachedValuePtr( HANDLE hContact, char* szSetting, int bAllo
 		else {

 			VLtemp.hContact=hContact;

 

-			if ( !li.List_GetIndex(&lContacts,&VLtemp,&index))

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

 			{

 				if ( bAllocate != 1 )

 					return NULL;

@@ -512,20 +512,20 @@ static INT_PTR SetSettingResident(WPARAM wParam,LPARAM lParam)
 		strcpy( szTemp+1, ( char* )lParam );

 

 		EnterCriticalSection(&csDbAccess);

-		if ( !li.List_GetIndex( &lSettings, szTemp, &idx ))

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

 			szSetting = InsertCachedSetting( szTemp, cbSettingNameLen, idx );

 		else

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

 

 		*szSetting = (char)wParam;

 

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

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

 		{

 			if (wParam)

-				li.List_Insert(&lResidentSettings,szSetting+1,idx);

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

 		}

 		else if (!wParam)

-			li.List_Remove(&lResidentSettings,idx);

+			List_Remove(&lResidentSettings,idx);

 

 		LeaveCriticalSection(&csDbAccess);

 	}

@@ -1006,8 +1006,8 @@ int InitSettings(void)
 void UninitSettings(void)

 {

 	HeapDestroy(hCacheHeap);

-	li.List_Destroy(&lContacts);

-	li.List_Destroy(&lSettings);

-	li.List_Destroy(&lGlobalSettings);

-	li.List_Destroy(&lResidentSettings);

+	List_Destroy(&lContacts);

+	List_Destroy(&lSettings);

+	List_Destroy(&lGlobalSettings);

+	List_Destroy(&lResidentSettings);

 }