- microkernel addded;

- version bumped to 0.92.2

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

2 files changed, 20 insertions, 20 deletions

diff --git a/plugins/Db3x/dbcontacts.cpp b/plugins/Db3x/dbcontacts.cpp
index 2918ba122b..ef128a491e 100644
--- a/plugins/Db3x/dbcontacts.cpp
+++ b/plugins/Db3x/dbcontacts.cpp
@@ -99,7 +99,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)) {

@@ -118,7 +118,7 @@ static INT_PTR FindNextContact(WPARAM wParam,LPARAM lParam)
 			if ( VL == NULL ) {

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

 				VL->hContact = VLtemp.hContact;

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

+				List_Insert(&lContacts,VL,index);

 			}

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

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

@@ -160,7 +160,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;

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

 			HeapFree( hCacheHeap, 0, VL );

 

-			li.List_Remove(&lContacts,index);

+			List_Remove(&lContacts,index);

 	}	}

 

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

@@ -214,7 +214,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;

@@ -257,8 +257,8 @@ static INT_PTR AddContact(WPARAM wParam,LPARAM lParam)
 		DBCachedContactValueList *VL = (DBCachedContactValueList*)HeapAlloc(hCacheHeap,HEAP_ZERO_MEMORY,sizeof(DBCachedContactValueList));

 		VL->hContact = (HANDLE)ofsNew;

 

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

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

+		List_GetIndex(&lContacts,VL,&index);

+		List_Insert(&lContacts,VL,index);

 	}

 

 	LeaveCriticalSection(&csDbAccess);

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

 		DBCachedContactValueList VLtemp,*VL;

 		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);

@@ -286,7 +286,7 @@ static INT_PTR IsDbContact(WPARAM wParam,LPARAM lParam)
 			if (ret) {

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

 				VL->hContact = (HANDLE)wParam;

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

+				List_Insert(&lContacts,VL,index);

 	}	}	}

 

 	LeaveCriticalSection(&csDbAccess);

diff --git a/plugins/Db3x/dbsettings.cpp b/plugins/Db3x/dbsettings.cpp
index c9cd3d01f7..ad7e470650 100644
--- a/plugins/Db3x/dbsettings.cpp
+++ b/plugins/Db3x/dbsettings.cpp
@@ -91,7 +91,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;

 }

 

@@ -108,7 +108,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, moduleNameLen+settingNameLen+3, index )+1;

@@ -150,11 +150,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;

 		}	}

@@ -164,7 +164,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;

@@ -174,7 +174,7 @@ static DBVARIANT* GetCachedValuePtr( HANDLE hContact, char* szSetting, int bAllo
 		DBCachedContactValueList VLtemp,*VL;

 

 		VLtemp.hContact=hContact;

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

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

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

 		}

 		else {

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

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

 			VL->hContact = hContact;

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

+			List_Insert(&lContacts,VL,index);

 		}

 

 		for ( V = VL->first; V != NULL; V = V->next)

@@ -501,7 +501,7 @@ 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+2, idx );

 	else

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

@@ -968,7 +968,7 @@ int InitSettings(void)
 void UninitSettings(void)

 {

 	HeapDestroy(hCacheHeap);

-	li.List_Destroy(&lContacts);

-	li.List_Destroy(&lSettings);

-	li.List_Destroy(&lGlobalSettings);

+	List_Destroy(&lContacts);

+	List_Destroy(&lSettings);

+	List_Destroy(&lGlobalSettings);

 }