- rest of menus cleared;

- old database macroses wiped out from all plugins (left in m_database.h for compatibility)

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

3 files changed, 116 insertions, 116 deletions

diff --git a/plugins/Sessions/Src/Main.cpp b/plugins/Sessions/Src/Main.cpp
index 89ef6e1266..b5c7fd658a 100644
--- a/plugins/Sessions/Src/Main.cpp
+++ b/plugins/Sessions/Src/Main.cpp
@@ -100,14 +100,14 @@ INT_PTR CALLBACK ExitDlgProc(HWND hdlg,UINT msg,WPARAM wparam,LPARAM lparam)
 				SavePosition(hdlg, "ExitDlg");

 				SaveSessionDate();

 				SaveSessionHandles(0,0);

-				DBWriteContactSettingByte(NULL, MODNAME, "lastempty", 0);

+				db_set_b(NULL, MODNAME, "lastempty", 0);

 				DestroyWindow(hdlg);

 			}break;

 

 			case IDCANCEL:

 			{

 				SavePosition(hdlg, "ExitDlg");

-				DBWriteContactSettingByte(NULL, MODNAME, "lastempty", 1);

+				db_set_b(NULL, MODNAME, "lastempty", 1);

 				DestroyWindow(hdlg);

 			}break;

 		}

@@ -287,7 +287,7 @@ INT_PTR CALLBACK LoadSessionDlgProc(HWND hdlg,UINT msg,WPARAM wparam,LPARAM lpar
 	{

 		case WM_INITDIALOG:

 		{

-			int iDelay=DBGetContactSettingWord(NULL, MODNAME, "StartupModeDelay", 1500);

+			int iDelay=db_get_w(NULL, MODNAME, "StartupModeDelay", 1500);

 			if(g_hghostw==TRUE)

 				SetTimer(hdlg, TIMERID_LOAD, iDelay, NULL);

 			else

@@ -359,7 +359,7 @@ INT_PTR CALLBACK LoadSessionDlgProc(HWND hdlg,UINT msg,WPARAM wparam,LPARAM lpar
 						int i=0;

 						while(session_list_recovered[i])

 						{

-							DBWriteContactSettingByte((HANDLE)session_list_recovered[i], MODNAME, "wasInLastSession", 0);

+							db_set_b((HANDLE)session_list_recovered[i], MODNAME, "wasInLastSession", 0);

 							i++;

 						}

 						ZeroMemory(session_list_recovered,SIZEOF(session_list_recovered));

@@ -494,7 +494,7 @@ int SaveSessionHandles(WPARAM wparam,LPARAM lparam)
 		if(lparam==1)

 		{

 			g_ses_count++;

-			DBWriteContactSettingByte(0, MODNAME, "UserSessionsCount", (BYTE)g_ses_count);

+			db_set_b(0, MODNAME, "UserSessionsCount", (BYTE)g_ses_count);

 		}

 		return 0;

 	}

@@ -552,11 +552,11 @@ int SaveSessionDate()
 		char szSessionDate[256];

 		DBVARIANT  dbv = {0};

 		mir_snprintf(szSessionDate, SIZEOF(szSessionDate), "%s_%d", "SessionDate", 0);

-		DBGetContactSettingTString(NULL, MODNAME, szSessionDate, &dbv);

+		db_get_ts(NULL, MODNAME, szSessionDate, &dbv);

 		TCHAR *szSessionDateBuf_1 = mir_tstrdup(dbv.ptszVal);

-		DBFreeVariant(&dbv);

+		db_free(&dbv);

 

-		DBWriteContactSettingTString(NULL, MODNAME, szSessionDate, szSessionTime);

+		db_set_ts(NULL, MODNAME, szSessionDate, szSessionTime);

 		mir_free(szSessionTime);

 		ResaveSettings("SessionDate", 1, ses_limit, szSessionDateBuf_1);

 

@@ -566,7 +566,7 @@ int SaveSessionDate()
 			mir_free(szDateBuf);

 	}

 	if(g_bCrashRecovery)

-		DBWriteContactSettingByte(NULL, MODNAME, "lastSaveCompleted", 1);

+		db_set_b(NULL, MODNAME, "lastSaveCompleted", 1);

 	return 0;

 }

 

@@ -583,14 +583,14 @@ int SaveUserSessionName(TCHAR *szUSessionName)
 	{

 		szUserSessionName = mir_tstrdup(szUSessionName);

 		mir_snprintf(szUserSessionNameBuf, SIZEOF(szUserSessionNameBuf), "%s_%u", "UserSessionDsc", 0);

-		if (!DBGetContactSettingTString(NULL, MODNAME, szUserSessionNameBuf, &dbv))

+		if (!db_get_ts(NULL, MODNAME, szUserSessionNameBuf, &dbv))

 		{

 			szUserSessionNameBuf_1 = mir_tstrdup(dbv.ptszVal);

-			DBFreeVariant(&dbv);

+			db_free(&dbv);

 			ResaveSettings("UserSessionDsc",1,255,szUserSessionNameBuf_1);

 		}

 

-		DBWriteContactSettingTString(NULL, MODNAME, szUserSessionNameBuf, szUserSessionName);

+		db_set_ts(NULL, MODNAME, szUserSessionNameBuf, szUserSessionName);

 

 		//free(szUserSessionNameBuf_1);

 		mir_free(szUserSessionName);

@@ -704,10 +704,10 @@ int DelUserDefSession(int ses_count)
 	}

 

 	mir_snprintf(szSessionName, SIZEOF(szSessionName), "%s_%u", "UserSessionDsc", ses_count);

-	DBDeleteContactSetting(NULL, MODNAME, szSessionName);

+	db_unset(NULL, MODNAME, szSessionName);

 

 	mir_snprintf(szSessionName, SIZEOF(szSessionName), "%s_%u", "FavUserSession", ses_count);

-	DBDeleteContactSetting(NULL, MODNAME, szSessionName);

+	db_unset(NULL, MODNAME, szSessionName);

 

 	for (i=(ses_count+1);;i++)

 	{

@@ -717,20 +717,20 @@ int DelUserDefSession(int ses_count)
 		{

 			MarkUserDefSession(i-1,IsMarkedUserDefSession(i));

 			mir_snprintf(szSessionName, SIZEOF(szSessionName), "%s_%u", "UserSessionDsc", i-1);

-			DBWriteContactSettingTString(NULL, MODNAME, szSessionName, szSessionNameBuf);

+			db_set_ts(NULL, MODNAME, szSessionName, szSessionNameBuf);

 		}

 		else

 		{

 			mir_snprintf(szSessionName, SIZEOF(szSessionName), "%s_%u", "UserSessionDsc", i-1);

-			DBDeleteContactSetting(NULL, MODNAME, szSessionName);

+			db_unset(NULL, MODNAME, szSessionName);

 

 			mir_snprintf(szSessionName, SIZEOF(szSessionName), "%s_%u", "FavUserSession", i-1);

-			DBDeleteContactSetting(NULL, MODNAME, szSessionName);

+			db_unset(NULL, MODNAME, szSessionName);

 			break;

 		}

 	}

 	g_ses_count--;

-	DBWriteContactSettingByte(0, MODNAME, "UserSessionsCount", (BYTE)g_ses_count);

+	db_set_b(0, MODNAME, "UserSessionsCount", (BYTE)g_ses_count);

 	mir_free(szSessionNameBuf);

 	return 0;

 }

@@ -751,7 +751,7 @@ int DeleteAutoSession(int ses_count)
 	}

 

 	mir_snprintf(szSessionName, SIZEOF(szSessionName), "%s_%u", "SessionDate", ses_count);

-	DBDeleteContactSetting(NULL, MODNAME, szSessionName);

+	db_unset(NULL, MODNAME, szSessionName);

 

 	for (i=(ses_count+1);;i++)

 	{

@@ -760,13 +760,13 @@ int DeleteAutoSession(int ses_count)
 		if ((szSessionNameBuf=DBGetStringT(NULL, MODNAME, szSessionName))/*&&(szSessionHandlesBuf=DBGetStringT(NULL,PLGNAME,szSessionHandles))*/)

 		{

 			mir_snprintf(szSessionName, SIZEOF(szSessionName), "%s_%u", "SessionDate", i-1);

-			DBWriteContactSettingTString(NULL, MODNAME, szSessionName, szSessionNameBuf);

+			db_set_ts(NULL, MODNAME, szSessionName, szSessionNameBuf);

 

 		}

 		else

 		{

 			mir_snprintf(szSessionName, SIZEOF(szSessionName), "%s_%u", "SessionDate", i-1);

-			DBDeleteContactSetting(NULL, MODNAME, szSessionName);

+			db_unset(NULL, MODNAME, szSessionName);

 			break;

 		}

 	}

@@ -789,30 +789,30 @@ int SessionPreShutdown(WPARAM wparam,LPARAM lparam)
 	if(g_bIncompletedSave) {

 		int i=0;

 		while(session_list_recovered[i]) {

-			DBWriteContactSettingByte((HANDLE)session_list_recovered[i], MODNAME, "wasInLastSession", 0);

+			db_set_b((HANDLE)session_list_recovered[i], MODNAME, "wasInLastSession", 0);

 			i++;

 		}

 	}

 

-	DBWriteContactSettingByte(NULL, MODNAME, "lastSaveCompleted", 1);

+	db_set_b(NULL, MODNAME, "lastSaveCompleted", 1);

 	return 0;

 }

 

 int OkToExit(WPARAM wparam,LPARAM lparam)

 {

-	int exitmode=DBGetContactSettingByte(NULL, MODNAME, "ShutdownMode", 2);

+	int exitmode=db_get_b(NULL, MODNAME, "ShutdownMode", 2);

 	DONT=1;

 	if(exitmode==2&&session_list[0]!=0)

 	{

 		SaveSessionDate();

 		SaveSessionHandles(0,0);

-		DBWriteContactSettingByte(NULL, MODNAME, "lastempty", 0);

+		db_set_b(NULL, MODNAME, "lastempty", 0);

 	}

 	else if(exitmode==1&&session_list[0]!=0)

 	{

 		DialogBox(hinstance,MAKEINTRESOURCE(IDD_EXDIALOG), 0, ExitDlgProc);

 	}

-	else   DBWriteContactSettingByte(NULL, MODNAME, "lastempty", 1);

+	else   db_set_b(NULL, MODNAME, "lastempty", 1);

 	return 0;

 }

 

@@ -824,12 +824,12 @@ static int GetContactHandle(WPARAM wparam,LPARAM lParam)
 	{

 		if (strstr(MWeventdata->szModule,"tabSRMsg")) g_mode=1;

 		AddToCurSession((DWORD)MWeventdata->hContact,0);

-		if(g_bCrashRecovery) DBWriteContactSettingByte(MWeventdata->hContact, MODNAME, "wasInLastSession", 1);

+		if(g_bCrashRecovery) db_set_b(MWeventdata->hContact, MODNAME, "wasInLastSession", 1);

 	}

 	else if(MWeventdata->uType == MSG_WINDOW_EVT_CLOSE)

 	{

 		if (!DONT) DelFromCurSession((DWORD)MWeventdata->hContact,0);

-		if(g_bCrashRecovery) DBWriteContactSettingByte(MWeventdata->hContact, MODNAME, "wasInLastSession", 0);

+		if(g_bCrashRecovery) db_set_b(MWeventdata->hContact, MODNAME, "wasInLastSession", 0);

 	}

 

 	return 0;

@@ -890,17 +890,17 @@ static int PluginInit(WPARAM wparam,LPARAM lparam)
 	hServiceSaveUserSession = CreateServiceFunction(MS_SESSIONS_SAVEUSERSESSION, SaveUserSessionHandles);

 	hServiceCloseCurrentSession = CreateServiceFunction(MS_SESSIONS_CLOSESESSION, CloseCurrentSession);

 

-	g_ses_count = DBGetContactSettingByte(0, MODNAME, "UserSessionsCount", 0);

+	g_ses_count = db_get_b(0, MODNAME, "UserSessionsCount", 0);

 	if (!g_ses_count)

-		g_ses_count = DBGetContactSettingByte(0, "Sessions (Unicode)", "UserSessionsCount", 0);

-	ses_limit = DBGetContactSettingByte(0, MODNAME, "TrackCount", 10);

-	g_bExclHidden = DBGetContactSettingByte(NULL, MODNAME, "ExclHidden", 0);

-	g_bWarnOnHidden = DBGetContactSettingByte(NULL, MODNAME, "WarnOnHidden", 0);

-	g_bOtherWarnings = DBGetContactSettingByte(NULL, MODNAME, "OtherWarnings", 1);

-	g_bCrashRecovery = DBGetContactSettingByte(NULL, MODNAME, "CrashRecovery", 0);

+		g_ses_count = db_get_b(0, "Sessions (Unicode)", "UserSessionsCount", 0);

+	ses_limit = db_get_b(0, MODNAME, "TrackCount", 10);

+	g_bExclHidden = db_get_b(NULL, MODNAME, "ExclHidden", 0);

+	g_bWarnOnHidden = db_get_b(NULL, MODNAME, "WarnOnHidden", 0);

+	g_bOtherWarnings = db_get_b(NULL, MODNAME, "OtherWarnings", 1);

+	g_bCrashRecovery = db_get_b(NULL, MODNAME, "CrashRecovery", 0);

 

 	if(g_bCrashRecovery)

-		g_bIncompletedSave=!DBGetContactSettingByte(NULL, MODNAME, "lastSaveCompleted", 0);

+		g_bIncompletedSave=!db_get_b(NULL, MODNAME, "lastSaveCompleted", 0);

 

 	if(g_bIncompletedSave)

 	{

@@ -911,16 +911,16 @@ static int PluginInit(WPARAM wparam,LPARAM lparam)
 		for (hContact = db_find_first(); hContact;

 			hContact = db_find_next(hContact))

 		{

-			if(DBGetContactSettingByte(hContact, MODNAME, "wasInLastSession", 0))

+			if(db_get_b(hContact, MODNAME, "wasInLastSession", 0))

 				session_list_recovered[i++]=(DWORD)hContact;

 		}

 	}

 	if (!session_list_recovered[0]) g_bIncompletedSave=FALSE;

-	DBWriteContactSettingByte(NULL, MODNAME, "lastSaveCompleted", 0);

+	db_set_b(NULL, MODNAME, "lastSaveCompleted", 0);

 

-	if (!DBGetContactSettingByte(NULL, MODNAME, "lastempty", 1)||g_bIncompletedSave) isLastTRUE=TRUE;

+	if (!db_get_b(NULL, MODNAME, "lastempty", 1)||g_bIncompletedSave) isLastTRUE=TRUE;

 

-	startup=DBGetContactSettingByte(NULL, MODNAME, "StartupMode", 3);

+	startup=db_get_b(NULL, MODNAME, "StartupMode", 3);

 

 	if (startup==1||(startup==3&&isLastTRUE==TRUE))

 	{

diff --git a/plugins/Sessions/Src/Options.cpp b/plugins/Sessions/Src/Options.cpp
index 24834c7047..b22d14b6f7 100644
--- a/plugins/Sessions/Src/Options.cpp
+++ b/plugins/Sessions/Src/Options.cpp
@@ -178,19 +178,19 @@ INT_PTR CALLBACK OptionsProc(HWND hdlg,UINT msg,WPARAM wparam,LPARAM lparam)
 

 			hIcon=(bChecked=IsMarkedUserDefSession(opses_count))?hMarked:hNotMarked;

 

-			SetDlgItemInt(hdlg, IDC_TRACK,ses_limit=DBGetContactSettingByte(0, MODNAME, "TrackCount", 10), FALSE);

+			SetDlgItemInt(hdlg, IDC_TRACK,ses_limit=db_get_b(0, MODNAME, "TrackCount", 10), FALSE);

 			SendDlgItemMessage(hdlg, IDC_SPIN1, UDM_SETRANGE, 0, MAKELONG(10, 1));

 			SendDlgItemMessage(hdlg, IDC_SPIN1, UDM_SETPOS, 0, GetDlgItemInt(hdlg, IDC_TRACK, NULL, FALSE));

 

 			SendDlgItemMessage(hdlg, IDC_OPCLIST, LB_RESETCONTENT, 0, 0);

-			SetDlgItemInt(hdlg, IDC_STARTDELAY, DBGetContactSettingWord(NULL, MODNAME, "StartupModeDelay", 1500), FALSE);

-			startupmode = DBGetContactSettingByte(NULL, MODNAME, "StartupMode", 3);

-			exitmode = DBGetContactSettingByte(NULL, MODNAME, "ShutdownMode", 2);

+			SetDlgItemInt(hdlg, IDC_STARTDELAY, db_get_w(NULL, MODNAME, "StartupModeDelay", 1500), FALSE);

+			startupmode = db_get_b(NULL, MODNAME, "StartupMode", 3);

+			exitmode = db_get_b(NULL, MODNAME, "ShutdownMode", 2);

 

-			g_bExclHidden = DBGetContactSettingByte(NULL, MODNAME, "ExclHidden", 0);	

-			g_bWarnOnHidden = DBGetContactSettingByte(NULL, MODNAME, "WarnOnHidden", 0);

-			g_bOtherWarnings = DBGetContactSettingByte(NULL, MODNAME, "OtherWarnings", 1);

-			g_bCrashRecovery = DBGetContactSettingByte(NULL, MODNAME, "CrashRecovery", 0);

+			g_bExclHidden = db_get_b(NULL, MODNAME, "ExclHidden", 0);	

+			g_bWarnOnHidden = db_get_b(NULL, MODNAME, "WarnOnHidden", 0);

+			g_bOtherWarnings = db_get_b(NULL, MODNAME, "OtherWarnings", 1);

+			g_bCrashRecovery = db_get_b(NULL, MODNAME, "CrashRecovery", 0);

 

 			CheckDlgButton(hdlg,IDC_EXCLHIDDEN,g_bExclHidden?BST_CHECKED:BST_UNCHECKED);

 			CheckDlgButton(hdlg,IDC_LASTHIDDENWARN,g_bWarnOnHidden?BST_CHECKED:BST_UNCHECKED);

@@ -262,26 +262,26 @@ INT_PTR CALLBACK OptionsProc(HWND hdlg,UINT msg,WPARAM wparam,LPARAM lparam)
 		case PSN_APPLY:

 			{

 				int iDelay=GetDlgItemInt(hdlg, IDC_STARTDELAY,NULL, FALSE);

-				DBWriteContactSettingWord(0, MODNAME, "StartupModeDelay", (WORD)iDelay);

+				db_set_w(0, MODNAME, "StartupModeDelay", (WORD)iDelay);

 

-				DBWriteContactSettingByte(0, MODNAME, "TrackCount", (BYTE)(ses_limit=GetDlgItemInt(hdlg, IDC_TRACK,NULL, FALSE)));

-				if(IsDlgButtonChecked(hdlg, IDC_REXSAVE)) DBWriteContactSettingByte(NULL, MODNAME, "ShutdownMode", 2);

-				else if(IsDlgButtonChecked(hdlg, IDC_REXDSAVE)) DBWriteContactSettingByte(NULL, MODNAME, "ShutdownMode", 0);

-				else if(IsDlgButtonChecked(hdlg, IDC_REXASK)) DBWriteContactSettingByte(NULL, MODNAME, "ShutdownMode", 1);			

+				db_set_b(0, MODNAME, "TrackCount", (BYTE)(ses_limit=GetDlgItemInt(hdlg, IDC_TRACK,NULL, FALSE)));

+				if(IsDlgButtonChecked(hdlg, IDC_REXSAVE)) db_set_b(NULL, MODNAME, "ShutdownMode", 2);

+				else if(IsDlgButtonChecked(hdlg, IDC_REXDSAVE)) db_set_b(NULL, MODNAME, "ShutdownMode", 0);

+				else if(IsDlgButtonChecked(hdlg, IDC_REXASK)) db_set_b(NULL, MODNAME, "ShutdownMode", 1);			

 

 				if(IsDlgButtonChecked(hdlg, IDC_STARTDIALOG))

 				{ 

 					if (!IsDlgButtonChecked(hdlg, IDC_CHECKLAST))

-						DBWriteContactSettingByte(NULL, MODNAME, "StartupMode", 1);

-					else DBWriteContactSettingByte(NULL, MODNAME, "StartupMode", 3);

+						db_set_b(NULL, MODNAME, "StartupMode", 1);

+					else db_set_b(NULL, MODNAME, "StartupMode", 3);

 				}

-				else if(IsDlgButtonChecked(hdlg, IDC_RLOADLAST)) DBWriteContactSettingByte(NULL, MODNAME, "StartupMode", 2);

-				else if(IsDlgButtonChecked(hdlg, IDC_RNOTHING)) DBWriteContactSettingByte(NULL, MODNAME, "StartupMode", 0);

+				else if(IsDlgButtonChecked(hdlg, IDC_RLOADLAST)) db_set_b(NULL, MODNAME, "StartupMode", 2);

+				else if(IsDlgButtonChecked(hdlg, IDC_RNOTHING)) db_set_b(NULL, MODNAME, "StartupMode", 0);

 

-				DBWriteContactSettingByte(NULL, MODNAME, "ExclHidden", (BYTE)(IsDlgButtonChecked(hdlg, IDC_EXCLHIDDEN) ? (g_bExclHidden = 1) : (g_bExclHidden = 0)));

-				DBWriteContactSettingByte(NULL, MODNAME, "WarnOnHidden", (BYTE)(IsDlgButtonChecked(hdlg, IDC_LASTHIDDENWARN) ? (g_bWarnOnHidden = 1) : (g_bWarnOnHidden = 0)));

-				DBWriteContactSettingByte(NULL, MODNAME, "OtherWarnings", (BYTE)(IsDlgButtonChecked(hdlg, IDC_WARNINGS) ? (g_bOtherWarnings = 1) : (g_bOtherWarnings = 0)));

-				DBWriteContactSettingByte(NULL, MODNAME, "CrashRecovery", (BYTE)(IsDlgButtonChecked(hdlg, IDC_CRASHRECOVERY) ? (g_bCrashRecovery = 1) : (g_bCrashRecovery = 0)));

+				db_set_b(NULL, MODNAME, "ExclHidden", (BYTE)(IsDlgButtonChecked(hdlg, IDC_EXCLHIDDEN) ? (g_bExclHidden = 1) : (g_bExclHidden = 0)));

+				db_set_b(NULL, MODNAME, "WarnOnHidden", (BYTE)(IsDlgButtonChecked(hdlg, IDC_LASTHIDDENWARN) ? (g_bWarnOnHidden = 1) : (g_bWarnOnHidden = 0)));

+				db_set_b(NULL, MODNAME, "OtherWarnings", (BYTE)(IsDlgButtonChecked(hdlg, IDC_WARNINGS) ? (g_bOtherWarnings = 1) : (g_bOtherWarnings = 0)));

+				db_set_b(NULL, MODNAME, "CrashRecovery", (BYTE)(IsDlgButtonChecked(hdlg, IDC_CRASHRECOVERY) ? (g_bCrashRecovery = 1) : (g_bCrashRecovery = 0)));

 

 				return 1;

 			}

diff --git a/plugins/Sessions/Src/Utils.cpp b/plugins/Sessions/Src/Utils.cpp
index fcd2898b77..bab43d06d3 100644
--- a/plugins/Sessions/Src/Utils.cpp
+++ b/plugins/Sessions/Src/Utils.cpp
@@ -29,7 +29,7 @@ void AddSessionMark(HANDLE hContact,int mode,char bit)
 	if(mode==0)

 	{	

 		DBVARIANT dbv;

-		if (!DBGetContactSettingString(hContact, MODNAME, "LastSessionsMarks", &dbv) && dbv.pszVal)

+		if (!db_get_s(hContact, MODNAME, "LastSessionsMarks", &dbv) && dbv.pszVal)

 		{

 			temp_1[0]=dbv.pszVal[0];

 			for (i=0;i<ses_limit;i++)		

@@ -41,16 +41,16 @@ void AddSessionMark(HANDLE hContact,int mode,char bit)
 			for (i=ses_limit;i<10;i++)

 				dbv.pszVal[i]='0';

 			dbv.pszVal[0]=bit;

-			DBWriteContactSettingString(hContact, MODNAME, "LastSessionsMarks", dbv.pszVal);

-			DBFreeVariant(&dbv);

+			db_set_s(hContact, MODNAME, "LastSessionsMarks", dbv.pszVal);

+			db_free(&dbv);

 		}

-		else if(bit=='1') DBWriteContactSettingString(hContact, MODNAME, "LastSessionsMarks", "10000000000");

+		else if(bit=='1') db_set_s(hContact, MODNAME, "LastSessionsMarks", "10000000000");

 	}

 

 	if (mode==1)

 	{

 		DBVARIANT dbv;

-		if (!DBGetContactSettingString(hContact, MODNAME, "UserSessionsMarks", &dbv) && dbv.pszVal)

+		if (!db_get_s(hContact, MODNAME, "UserSessionsMarks", &dbv) && dbv.pszVal)

 		{   

 			if(strlen(dbv.pszVal)<g_ses_count)

 			{

@@ -61,7 +61,7 @@ void AddSessionMark(HANDLE hContact,int mode,char bit)
 			else

 				pszBuffer = mir_strdup(dbv.pszVal);

 

-			DBFreeVariant(&dbv);

+			db_free(&dbv);

 

 			temp_1[0]=pszBuffer[0];

 			for (i=0;i<g_ses_count;i++)		

@@ -71,12 +71,12 @@ void AddSessionMark(HANDLE hContact,int mode,char bit)
 				temp_1[0]=temp_2[0];

 			}

 			pszBuffer[0]=bit;

-			DBWriteContactSettingString(hContact, MODNAME, "UserSessionsMarks", pszBuffer);

+			db_set_s(hContact, MODNAME, "UserSessionsMarks", pszBuffer);

 			

 			mir_free(pszBuffer);

 		}

-		else if(bit=='1')DBWriteContactSettingString(hContact, MODNAME, "UserSessionsMarks", "10000000000");

-		else  DBWriteContactSettingString(hContact, MODNAME, "UserSessionsMarks", "00000000000");

+		else if(bit=='1')db_set_s(hContact, MODNAME, "UserSessionsMarks", "10000000000");

+		else  db_set_s(hContact, MODNAME, "UserSessionsMarks", "00000000000");

 	}

 }

 

@@ -88,7 +88,7 @@ void RemoveSessionMark(HANDLE hContact,int mode,int marknum)
 	if(mode==0)

 	{

 		DBVARIANT dbv;

-		if (!DBGetContactSettingString(hContact, MODNAME, "LastSessionsMarks", &dbv) && dbv.pszVal)

+		if (!db_get_s(hContact, MODNAME, "LastSessionsMarks", &dbv) && dbv.pszVal)

 		{

 			for (i=marknum;i<ses_limit;i++)		

 				dbv.pszVal[i]=dbv.pszVal[i+1];

@@ -96,20 +96,20 @@ void RemoveSessionMark(HANDLE hContact,int mode,int marknum)
 			for (i=ses_limit;i<10;i++)

 				dbv.pszVal[i]='0';

 

-			DBWriteContactSettingString(hContact, MODNAME, "LastSessionsMarks", dbv.pszVal);

-			DBFreeVariant(&dbv);

+			db_set_s(hContact, MODNAME, "LastSessionsMarks", dbv.pszVal);

+			db_free(&dbv);

 		}

 	}

 	if (mode==1)

 	{

 		DBVARIANT dbv;

-		if (!DBGetContactSettingString(hContact, MODNAME, "UserSessionsMarks", &dbv) && dbv.pszVal)

+		if (!db_get_s(hContact, MODNAME, "UserSessionsMarks", &dbv) && dbv.pszVal)

 		{

 			for (i=marknum;i<ses_limit;i++)		

 				dbv.pszVal[i]=dbv.pszVal[i+1];

 

-			DBWriteContactSettingString(hContact, MODNAME, "UserSessionsMarks", dbv.pszVal);

-			DBFreeVariant(&dbv);

+			db_set_s(hContact, MODNAME, "UserSessionsMarks", dbv.pszVal);

+			db_free(&dbv);

 		}

 	}

 }

@@ -121,25 +121,25 @@ void SetSessionMark(HANDLE hContact,int mode,char bit,unsigned int marknum)
 	if(mode==0)

 	{	

 		DBVARIANT dbv;

-		if (!DBGetContactSettingString(hContact, MODNAME, "LastSessionsMarks", &dbv) && dbv.pszVal)

+		if (!db_get_s(hContact, MODNAME, "LastSessionsMarks", &dbv) && dbv.pszVal)

 		{

 			dbv.pszVal[marknum]=bit;

-			DBWriteContactSettingString(hContact, MODNAME, "LastSessionsMarks", dbv.pszVal);

+			db_set_s(hContact, MODNAME, "LastSessionsMarks", dbv.pszVal);

 

-			DBFreeVariant(&dbv);

+			db_free(&dbv);

 		}

 	}

 

 	if (mode==1)

 	{

 		DBVARIANT dbv;

-		if (!DBGetContactSettingString(hContact, MODNAME, "UserSessionsMarks", &dbv) && dbv.pszVal)

+		if (!db_get_s(hContact, MODNAME, "UserSessionsMarks", &dbv) && dbv.pszVal)

 		{

 			pszBuffer = mir_strdup(dbv.pszVal);

 			pszBuffer[marknum]=bit;

-			DBWriteContactSettingString(hContact, MODNAME, "UserSessionsMarks", pszBuffer);

+			db_set_s(hContact, MODNAME, "UserSessionsMarks", pszBuffer);

 			mir_free(pszBuffer);

-			DBFreeVariant(&dbv);

+			db_free(&dbv);

 		}

 	}

 }

@@ -148,21 +148,21 @@ BOOL LoadContactsFromMask(HANDLE hContact,int mode,int count)
 {	

 	if (mode == 0) {	

 		DBVARIANT dbv;

-		if ( DBGetContactSettingString(hContact, MODNAME, "LastSessionsMarks", &dbv))

+		if ( db_get_s(hContact, MODNAME, "LastSessionsMarks", &dbv))

 			return 0;

 

 		BOOL res = dbv.pszVal[count] == '1';

-		DBFreeVariant(&dbv);

+		db_free(&dbv);

 		return res;

 	}

 

 	if (mode == 1) {

 		DBVARIANT dbv;

-		if ( DBGetContactSettingString(hContact, MODNAME, "UserSessionsMarks", &dbv))

+		if ( db_get_s(hContact, MODNAME, "UserSessionsMarks", &dbv))

 			return 0;

 

 		BOOL res = dbv.pszVal[count] == '1';

-		DBFreeVariant(&dbv);

+		db_free(&dbv);

 		return res;

 	}

 	return 0;

@@ -184,7 +184,7 @@ void AddInSessionOrder(HANDLE hContact,int mode,int ordernum,int writemode)
 	if(mode==0)

 	{

 		DBVARIANT dbv;

-		if (!DBGetContactSettingString(hContact, MODNAME, "LastSessionsOrder", &dbv))

+		if (!db_get_s(hContact, MODNAME, "LastSessionsOrder", &dbv))

 		{	  

 			char* temp=NULL;

 			char* temp2=NULL;

@@ -208,10 +208,10 @@ void AddInSessionOrder(HANDLE hContact,int mode,int ordernum,int writemode)
 			for (i=(ses_limit*2);i<20;i++)

 				temp[i]='0';

 

-			DBWriteContactSettingString(hContact, MODNAME, "LastSessionsOrder", temp);

+			db_set_s(hContact, MODNAME, "LastSessionsOrder", temp);

 			mir_free(temp);

 			mir_free(temp2);

-			DBFreeVariant(&dbv);

+			db_free(&dbv);

 		}

 		else if(writemode==1)

 		{

@@ -221,7 +221,7 @@ void AddInSessionOrder(HANDLE hContact,int mode,int ordernum,int writemode)
  			else

 				mir_snprintf(szFormNumBuf, SIZEOF(szFormNumBuf), "%u%s", ordernum, "000000000000000000");

 

-			DBWriteContactSettingString(hContact, MODNAME, "LastSessionsOrder", szFormNumBuf);

+			db_set_s(hContact, MODNAME, "LastSessionsOrder", szFormNumBuf);

 		}

 	}

 

@@ -229,7 +229,7 @@ void AddInSessionOrder(HANDLE hContact,int mode,int ordernum,int writemode)
 	{

 		DBVARIANT dbv;

 		int advlen=0;

-		if (!DBGetContactSettingString(hContact, MODNAME, "UserSessionsOrder", &dbv) && dbv.pszVal)

+		if (!db_get_s(hContact, MODNAME, "UserSessionsOrder", &dbv) && dbv.pszVal)

 		{

 			char* temp=NULL;

 			char* temp2=NULL;

@@ -257,16 +257,16 @@ void AddInSessionOrder(HANDLE hContact,int mode,int ordernum,int writemode)
 			else 

 				mir_snprintf(temp, advlen+1, "%u%s", ordernum, dbv.pszVal);

 				

-			DBFreeVariant(&dbv);

+			db_free(&dbv);

 

-			DBWriteContactSettingString(hContact, MODNAME, "UserSessionsOrder", temp);

+			db_set_s(hContact, MODNAME, "UserSessionsOrder", temp);

 			mir_free(temp);

 			mir_free(pszBuffer);

 		}

 		else if(writemode==1)

-			DBWriteContactSettingString(hContact, MODNAME, "UserSessionsOrder", szFormNumBuf);

+			db_set_s(hContact, MODNAME, "UserSessionsOrder", szFormNumBuf);

 		else

-			DBWriteContactSettingString(hContact, MODNAME, "UserSessionsOrder", "00");

+			db_set_s(hContact, MODNAME, "UserSessionsOrder", "00");

 	}

 }

 

@@ -277,23 +277,23 @@ int GetInSessionOrder(HANDLE hContact,int mode,int count)
 	if(mode==0)

 	{	

 		DBVARIANT dbv;

-		if (!DBGetContactSettingString(hContact, MODNAME, "LastSessionsOrder", &dbv) && dbv.pszVal)

+		if (!db_get_s(hContact, MODNAME, "LastSessionsOrder", &dbv) && dbv.pszVal)

 		{

 			szTemp[0]=dbv.pszVal[count*2];

 			szTemp[1]=dbv.pszVal[count*2+1];

 			iOrder=atoi(szTemp);

-			DBFreeVariant(&dbv);

+			db_free(&dbv);

 		}

 	}

 	if (mode==1)

 	{

 		DBVARIANT dbv;

-		if (!DBGetContactSettingString(hContact, MODNAME, "UserSessionsOrder", &dbv) && dbv.pszVal)

+		if (!db_get_s(hContact, MODNAME, "UserSessionsOrder", &dbv) && dbv.pszVal)

 		{

 			szTemp[0]=dbv.pszVal[count*2];

 			szTemp[1]=dbv.pszVal[count*2+1];

 			iOrder=atoi(szTemp);

-			DBFreeVariant(&dbv);

+			db_free(&dbv);

 		}

 	}

 	return iOrder;

@@ -312,24 +312,24 @@ void SetInSessionOrder(HANDLE hContact,int mode,int count,unsigned int ordernum)
 	if(mode==0)

 	{	

 		DBVARIANT dbv;

-		if (!DBGetContactSettingString(hContact, MODNAME, "LastSessionsOrder", &dbv) && dbv.pszVal)

+		if (!db_get_s(hContact, MODNAME, "LastSessionsOrder", &dbv) && dbv.pszVal)

 		{

 			dbv.pszVal[count*2]=szTemp[0];

 			dbv.pszVal[count*2+1]=szTemp[1];

-			DBWriteContactSettingString(hContact, MODNAME, "LastSessionsOrder", dbv.pszVal);

-			DBFreeVariant(&dbv);

+			db_set_s(hContact, MODNAME, "LastSessionsOrder", dbv.pszVal);

+			db_free(&dbv);

 		}

 	}

 

 	if (mode==1)

 	{

 		DBVARIANT dbv;

-		if (!DBGetContactSettingString(hContact, MODNAME, "UserSessionsOrder", &dbv) && dbv.pszVal)

+		if (!db_get_s(hContact, MODNAME, "UserSessionsOrder", &dbv) && dbv.pszVal)

 		{

 			dbv.pszVal[count*2]=szTemp[0];

 			dbv.pszVal[count*2+1]=szTemp[1];

-			DBWriteContactSettingString(hContact, MODNAME, "UserSessionsOrder", dbv.pszVal);

-			DBFreeVariant(&dbv);

+			db_set_s(hContact, MODNAME, "UserSessionsOrder", dbv.pszVal);

+			db_free(&dbv);

 		}

 	}

 }

@@ -347,8 +347,8 @@ BOOL ResaveSettings(char* szName,int iFirst,int iLimit,TCHAR* szBuffer)
 		mir_snprintf(szNameBuf, SIZEOF(szNameBuf), "%s_%u", szName, i);

 

 		DBVARIANT dbv_temp;

-		int res = DBGetContactSettingTString(NULL, MODNAME, szNameBuf, &dbv_temp);

-		DBWriteContactSettingTString(NULL, MODNAME, szNameBuf, szBuffer);

+		int res = db_get_ts(NULL, MODNAME, szNameBuf, &dbv_temp);

+		db_set_ts(NULL, MODNAME, szNameBuf, szBuffer);

 		mir_free(szBuffer);

 

 		marked = IsMarkedUserDefSession(i);

@@ -359,7 +359,7 @@ BOOL ResaveSettings(char* szName,int iFirst,int iLimit,TCHAR* szBuffer)
 			return 0;

 			

 		szBuffer = mir_tstrdup(dbv_temp.ptszVal);

-		DBFreeVariant(&dbv_temp);

+		db_free(&dbv_temp);

 	}

 

 	mir_free(szBuffer);

@@ -499,7 +499,7 @@ void OffsetWindow(HWND parent, HWND hwnd, int dx, int dy)
 

 int CheckContactVisibility(HANDLE hContact)

 { 

-	if (DBGetContactSettingByte(hContact, "CList", "Hidden", 0))

+	if (db_get_b(hContact, "CList", "Hidden", 0))

 		return 0;

 	return 1;

 }

@@ -508,14 +508,14 @@ void RenameUserDefSession(int ses_count,TCHAR* ptszNewName)
 {

 	char szSession[256]={0};

 	mir_snprintf(szSession, SIZEOF(szSession), "%s_%u", "UserSessionDsc", ses_count);

-	DBWriteContactSettingTString(NULL, MODNAME, szSession, ptszNewName);

+	db_set_ts(NULL, MODNAME, szSession, ptszNewName);

 }

 

 int MarkUserDefSession(int ses_count,BYTE bCheck)

 {

 	char szSessionName[256]={0};

 	mir_snprintf(szSessionName, SIZEOF(szSessionName), "%s_%u", "FavUserSession", ses_count);

-	DBWriteContactSettingByte(NULL, MODNAME, szSessionName, bCheck);

+	db_set_b(NULL, MODNAME, szSessionName, bCheck);

 	return 0;

 }

 

@@ -523,7 +523,7 @@ BYTE IsMarkedUserDefSession(int ses_count)
 {

 	char szSessionName[256]={0};

 	mir_snprintf(szSessionName, SIZEOF(szSessionName), "%s_%u","FavUserSession", ses_count);

-	return DBGetContactSettingByte(NULL, MODNAME, szSessionName, 0);

+	return db_get_b(NULL, MODNAME, szSessionName, 0);

 }

 

 void SavePosition(HWND hwnd, char *wndName)

@@ -532,9 +532,9 @@ void SavePosition(HWND hwnd, char *wndName)
 	char buffer[512];

 	GetWindowRect(hwnd, &rc);

 	mir_snprintf(buffer, SIZEOF(buffer), "%sPosX", wndName);

-	DBWriteContactSettingDword(0, MODNAME, buffer, rc.left);

+	db_set_dw(0, MODNAME, buffer, rc.left);

 	mir_snprintf(buffer, SIZEOF(buffer), "%sPosY", wndName);

-	DBWriteContactSettingDword(0, MODNAME, buffer, rc.top);

+	db_set_dw(0, MODNAME, buffer, rc.top);

 }

 

 void LoadPosition(HWND hWnd, char *wndName)

@@ -542,8 +542,8 @@ void LoadPosition(HWND hWnd, char *wndName)
 	char buffer[512];

 	int x,y ;

 	mir_snprintf(buffer, SIZEOF(buffer), "%sPosX", wndName);

-	x = DBGetContactSettingDword(0, MODNAME, buffer, ((GetSystemMetrics(SM_CXSCREEN)) / 2)-130);

+	x = db_get_dw(0, MODNAME, buffer, ((GetSystemMetrics(SM_CXSCREEN)) / 2)-130);

 	mir_snprintf(buffer, SIZEOF(buffer), "%sPosY", wndName);

-	y = DBGetContactSettingDword(0, MODNAME, buffer, ((GetSystemMetrics(SM_CYSCREEN))/ 2)-80);

+	y = db_get_dw(0, MODNAME, buffer, ((GetSystemMetrics(SM_CYSCREEN))/ 2)-80);

 	SetWindowPos(hWnd, NULL, x, y, 0, 0, SWP_NOZORDER | SWP_NOOWNERZORDER | SWP_NOSIZE);

 }
\ No newline at end of file