applied protocol helpers

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

1 files changed, 42 insertions, 42 deletions

diff --git a/protocols/MRA/src/Mra_proto.cpp b/protocols/MRA/src/Mra_proto.cpp
index 8b4a9318ed..ee8c91cd66 100644
--- a/protocols/MRA/src/Mra_proto.cpp
+++ b/protocols/MRA/src/Mra_proto.cpp
@@ -54,12 +54,12 @@ void CMraProto::MraThreadProc(LPVOID lpParameter)
 

 	SleepEx(100, FALSE);// to prevent high CPU load by some status plugins like allwaysonline

 

-	dwConnectReTryCount = mraGetDword(NULL, "ConnectReTryCountMRIM", MRA_DEFAULT_CONN_RETRY_COUNT_MRIM);

+	dwConnectReTryCount = getDword(NULL, "ConnectReTryCountMRIM", MRA_DEFAULT_CONN_RETRY_COUNT_MRIM);

 

 	nloc.cbSize = sizeof(nloc);

 	nloc.flags = NLOCF_V2;

 	nloc.szHost = szHost;

-	nloc.timeout = mraGetDword(NULL, "TimeOutConnectMRIM", MRA_DEFAULT_TIMEOUT_CONN_MRIM);

+	nloc.timeout = getDword(NULL, "TimeOutConnectMRIM", MRA_DEFAULT_TIMEOUT_CONN_MRIM);

 	if (nloc.timeout<MRA_TIMEOUT_CONN_MIN) nloc.timeout = MRA_TIMEOUT_CONN_MIN;

 	if (nloc.timeout>MRA_TIMEOUT_CONN_МАХ) nloc.timeout = MRA_TIMEOUT_CONN_МАХ;

 

@@ -77,11 +77,11 @@ void CMraProto::MraThreadProc(LPVOID lpParameter)
 	}

 

 	if (bConnected == FALSE)

-	if (mraGetByte(NULL, "NLBFailDirectConnect", MRA_DEFAULT_NLB_FAIL_DIRECT_CONNECT)) {

+	if (getByte(NULL, "NLBFailDirectConnect", MRA_DEFAULT_NLB_FAIL_DIRECT_CONNECT)) {

 		if (IsHTTPSProxyUsed(hNetlibUser))

 			nloc.wPort = MRA_SERVER_PORT_HTTPS;

 		else {

-			nloc.wPort = mraGetWord(NULL, "ServerPort", MRA_DEFAULT_SERVER_PORT);

+			nloc.wPort = getWord(NULL, "ServerPort", MRA_DEFAULT_SERVER_PORT);

 			if (nloc.wPort == MRA_SERVER_PORT_STANDART_NLB) nloc.wPort = MRA_SERVER_PORT_STANDART;

 		}

 

@@ -143,7 +143,7 @@ DWORD CMraProto::MraGetNLBData(LPSTR lpszHost, size_t dwHostBuffSize, WORD *pwPo
 	NETLIBSELECT nls = {0};

 	NETLIBOPENCONNECTION nloc = {0};

 

-	dwConnectReTryCount = mraGetDword(NULL, "ConnectReTryCountNLB", MRA_DEFAULT_CONN_RETRY_COUNT_NLB);

+	dwConnectReTryCount = getDword(NULL, "ConnectReTryCountNLB", MRA_DEFAULT_CONN_RETRY_COUNT_NLB);

 

 	nloc.cbSize = sizeof(nloc);

 	nloc.flags = NLOCF_V2;

@@ -155,9 +155,9 @@ DWORD CMraProto::MraGetNLBData(LPSTR lpszHost, size_t dwHostBuffSize, WORD *pwPo
 	if ( IsHTTPSProxyUsed(hNetlibUser))

 		nloc.wPort = MRA_SERVER_PORT_HTTPS;

 	else

-		nloc.wPort = mraGetWord(NULL, "ServerPort", MRA_DEFAULT_SERVER_PORT);

+		nloc.wPort = getWord(NULL, "ServerPort", MRA_DEFAULT_SERVER_PORT);

 

-	nloc.timeout = mraGetDword(NULL, "TimeOutConnectNLB", MRA_DEFAULT_TIMEOUT_CONN_NLB);

+	nloc.timeout = getDword(NULL, "TimeOutConnectNLB", MRA_DEFAULT_TIMEOUT_CONN_NLB);

 	if (nloc.timeout<MRA_TIMEOUT_CONN_MIN) nloc.timeout = MRA_TIMEOUT_CONN_MIN;

 	if (nloc.timeout>MRA_TIMEOUT_CONN_МАХ) nloc.timeout = MRA_TIMEOUT_CONN_МАХ;

 

@@ -170,7 +170,7 @@ DWORD CMraProto::MraGetNLBData(LPSTR lpszHost, size_t dwHostBuffSize, WORD *pwPo
 

 	if (nls.hReadConns[0]) {

 		nls.cbSize = sizeof(nls);

-		nls.dwTimeout = 1000 * mraGetDword(NULL, "TimeOutReceiveNLB", MRA_DEFAULT_TIMEOUT_RECV_NLB);

+		nls.dwTimeout = 1000 * getDword(NULL, "TimeOutReceiveNLB", MRA_DEFAULT_TIMEOUT_RECV_NLB);

 		InterlockedExchange((volatile LONG*)&dwThreadWorkerLastPingTime, GetTickCount());

 

 		while (m_iStatus != ID_STATUS_OFFLINE && bContinue) {

@@ -434,7 +434,7 @@ DWORD CMraProto::MraCommandDispatcher(mrim_packet_header_t *pmaHeader, DWORD *pd
 					szSelfVersionString, __FILEVERSION_STRING, PROTO_VERSION_MAJOR, PROTO_VERSION_MINOR);

 			}

 

-			dwFutureFlags = ((mraGetByte(NULL, "RTFReceiveEnable", MRA_DEFAULT_RTF_RECEIVE_ENABLE)? FEATURE_FLAG_RTF_MESSAGE:0)|MRA_FEATURE_FLAGS);

+			dwFutureFlags = ((getByte(NULL, "RTFReceiveEnable", MRA_DEFAULT_RTF_RECEIVE_ENABLE)? FEATURE_FLAG_RTF_MESSAGE:0)|MRA_FEATURE_FLAGS);

 

 			if (mraGetStaticStringA(NULL, "e-mail", szEMail, SIZEOF(szEMail), &dwEMailSize))

 				MraLogin2W(szEMail, dwEMailSize, (LPSTR)szBuff, dwStringSize, dwStatus, lpcszStatusUri[dwXStatus], lstrlenA(lpcszStatusUri[dwXStatus]), lpwszStatusTitle, dwStatusTitleSize, lpwszStatusDesc, dwStatusDescSize, dwFutureFlags, szUserAgentFormated, dwUserAgentFormattedSize, szSelfVersionString, dwSelfVersionSize);

@@ -552,7 +552,7 @@ DWORD CMraProto::MraCommandDispatcher(mrim_packet_header_t *pmaHeader, DWORD *pd
 				if (lpszDelimiter) {

 					(*lpszDelimiter) = 0;

 					lpszDelimiter = (LPSTR)szBuff;

-					mraSetDword(NULL, "IP", HTONL(inet_addr(lpszDelimiter)));

+					setDword(NULL, "IP", HTONL(inet_addr(lpszDelimiter)));

 				}

 			}

 			else if ( !_strnicmp(lpsString.lpszData, "connect.xml", 11)) {

@@ -574,7 +574,7 @@ DWORD CMraProto::MraCommandDispatcher(mrim_packet_header_t *pmaHeader, DWORD *pd
 			}

 			else if ( !_strnicmp(lpsString.lpszData, "micblog.status.time", 19)) {

 				GetLPS(lpbData, dwDataSize, &lpbDataCurrent, &lpsString);

-				mraSetDword(NULL, DBSETTING_BLOGSTATUSTIME, StrToUNum32(lpsString.lpszData, lpsString.dwSize));

+				setDword(NULL, DBSETTING_BLOGSTATUSTIME, StrToUNum32(lpsString.lpszData, lpsString.dwSize));

 			}

 			else if ( !_strnicmp(lpsString.lpszData, "micblog.status.text", 19)) {

 				GetLPS(lpbData, dwDataSize, &lpbDataCurrent, &lpsString);

@@ -582,31 +582,31 @@ DWORD CMraProto::MraCommandDispatcher(mrim_packet_header_t *pmaHeader, DWORD *pd
 			}

 			else if ( !_strnicmp(lpsString.lpszData, "HAS_MYMAIL", 10)) {

 				GetLPS(lpbData, dwDataSize, &lpbDataCurrent, &lpsString);

-				//mraSetDword(NULL, DBSETTING_BLOGSTATUSTIME, StrToUNum32(lpsString.lpszData, lpsString.dwSize));

+				//setDword(NULL, DBSETTING_BLOGSTATUSTIME, StrToUNum32(lpsString.lpszData, lpsString.dwSize));

 			}

 			else if ( !_strnicmp(lpsString.lpszData, "mrim.status.open_search", 23)) {

 				GetLPS(lpbData, dwDataSize, &lpbDataCurrent, &lpsString);

-				//mraSetDword(NULL, DBSETTING_BLOGSTATUSTIME, StrToUNum32(lpsString.lpszData, lpsString.dwSize));

+				//setDword(NULL, DBSETTING_BLOGSTATUSTIME, StrToUNum32(lpsString.lpszData, lpsString.dwSize));

 			}

 			else if ( !_strnicmp(lpsString.lpszData, "rb.target.cookie", 16)) {

 				GetLPS(lpbData, dwDataSize, &lpbDataCurrent, &lpsString);

-				//mraSetDword(NULL, DBSETTING_BLOGSTATUSTIME, StrToUNum32(lpsString.lpszData, lpsString.dwSize));

+				//setDword(NULL, DBSETTING_BLOGSTATUSTIME, StrToUNum32(lpsString.lpszData, lpsString.dwSize));

 			}

 			else if ( !_strnicmp(lpsString.lpszData, "show_web_history_link", 21)) {

 				GetLPS(lpbData, dwDataSize, &lpbDataCurrent, &lpsString);

-				//mraSetDword(NULL, DBSETTING_BLOGSTATUSTIME, StrToUNum32(lpsString.lpszData, lpsString.dwSize));

+				//setDword(NULL, DBSETTING_BLOGSTATUSTIME, StrToUNum32(lpsString.lpszData, lpsString.dwSize));

 			}

 			else if ( !_strnicmp(lpsString.lpszData, "friends_suggest", 15)) {

 				GetLPS(lpbData, dwDataSize, &lpbDataCurrent, &lpsString);

-				//mraSetDword(NULL, DBSETTING_BLOGSTATUSTIME, StrToUNum32(lpsString.lpszData, lpsString.dwSize));

+				//setDword(NULL, DBSETTING_BLOGSTATUSTIME, StrToUNum32(lpsString.lpszData, lpsString.dwSize));

 			}

 			else if ( !_strnicmp(lpsString.lpszData, "timestamp", 9)) {

 				GetLPS(lpbData, dwDataSize, &lpbDataCurrent, &lpsString);

-				//mraSetDword(NULL, DBSETTING_BLOGSTATUSTIME, StrToUNum32(lpsString.lpszData, lpsString.dwSize));

+				//setDword(NULL, DBSETTING_BLOGSTATUSTIME, StrToUNum32(lpsString.lpszData, lpsString.dwSize));

 			}

 			else if ( !_strnicmp(lpsString.lpszData, "trusted_update", 14)) {

 				GetLPS(lpbData, dwDataSize, &lpbDataCurrent, &lpsString);

-				//mraSetDword(NULL, DBSETTING_BLOGSTATUSTIME, StrToUNum32(lpsString.lpszData, lpsString.dwSize));

+				//setDword(NULL, DBSETTING_BLOGSTATUSTIME, StrToUNum32(lpsString.lpszData, lpsString.dwSize));

 			}

 			else {

 				#ifdef _DEBUG

@@ -675,9 +675,9 @@ DWORD CMraProto::MraCommandDispatcher(mrim_packet_header_t *pmaHeader, DWORD *pd
 			GetContactBasicInfoW(hContact, NULL, NULL, NULL, &dwTemp, NULL, NULL, 0, NULL, NULL, 0, NULL, NULL, 0, NULL);

 			dwTemp &= ~CONTACT_INTFLAG_NOT_AUTHORIZED;

 			SetContactBasicInfoW(hContact, SCBIFSI_LOCK_CHANGES_EVENTS, SCBIF_SERVER_FLAG, 0, 0, 0, dwTemp, 0, NULL, 0, NULL, 0, NULL, 0);

-			mraSetDword(hContact, "HooksLocked", TRUE);

+			setDword(hContact, "HooksLocked", TRUE);

 			db_unset(hContact, "CList", "NotOnList");

-			mraSetDword(hContact, "HooksLocked", FALSE);

+			setDword(hContact, "HooksLocked", FALSE);

 		}

 		break;

 

@@ -785,13 +785,13 @@ DWORD CMraProto::MraCommandDispatcher(mrim_packet_header_t *pmaHeader, DWORD *pd
 				dwTemp = GetMiradaStatusFromMraStatus(dwStatus, GetMraXStatusIDFromMraUriStatus(lpsSpecStatusUri.lpszData, lpsSpecStatusUri.dwSize), &dwXStatus);

 

 				MraContactCapabilitiesSet(hContact, dwFutureFlags);

-				mraSetByte(hContact, DBSETTING_XSTATUSID, (BYTE)dwXStatus);

+				setByte(hContact, DBSETTING_XSTATUSID, (BYTE)dwXStatus);

 				mraSetLPSStringW(hContact, DBSETTING_XSTATUSNAME, &lpsStatusTitle);

 				mraSetLPSStringW(hContact, DBSETTING_XSTATUSMSG, &lpsStatusDesc);

 

 				if (dwTemp != ID_STATUS_OFFLINE) { // пишем клиента только если юзер не отключён, иначе не затираем старое

 					if (lpsUserAgentFormated.dwSize) {

-						if (mraGetByte(NULL, "MirVerRaw", MRA_DEFAULT_MIRVER_RAW) == FALSE) {

+						if (getByte(NULL, "MirVerRaw", MRA_DEFAULT_MIRVER_RAW) == FALSE) {

 							MraGetVersionStringFromFormatted(lpsUserAgentFormated.lpszData, lpsUserAgentFormated.dwSize, (LPSTR)szBuff, SIZEOF(szBuff), &dwStringSize);

 							lpsUserAgentFormated.lpszData = (LPSTR)szBuff;

 							lpsUserAgentFormated.dwSize = dwStringSize;

@@ -893,7 +893,7 @@ DWORD CMraProto::MraCommandDispatcher(mrim_packet_header_t *pmaHeader, DWORD *pd
 

 							// write to DB and exit loop

 							if (dwAckType == ACKTYPE_GETINFO && hContact) {

-								mraSetDword(hContact, "InfoTS", (DWORD)_time32(NULL));

+								setDword(hContact, "InfoTS", (DWORD)_time32(NULL));

 								//MRA_LPS mralpsUsernameValue;

 								for (i = 0; i < dwFeildsNum; i++) {

 									if ( !_strnicmp(pmralpsFeilds[i].lpszData, "Username", 8))

@@ -911,10 +911,10 @@ DWORD CMraProto::MraCommandDispatcher(mrim_packet_header_t *pmaHeader, DWORD *pd
 									else if ( !_strnicmp(pmralpsFeilds[i].lpszData, "Sex", 3)) {

 										switch (StrToUNum32(pmralpsValues[i].lpszData, pmralpsValues[i].dwSize)) {

 										case 1:// мужской

-											mraSetByte(hContact, "Gender", 'M');

+											setByte(hContact, "Gender", 'M');

 											break;

 										case 2:// женский

-											mraSetByte(hContact, "Gender", 'F');

+											setByte(hContact, "Gender", 'F');

 											break;

 										default:// а фиг его знает

 											mraDelValue(hContact, "Gender");

@@ -928,11 +928,11 @@ DWORD CMraProto::MraCommandDispatcher(mrim_packet_header_t *pmaHeader, DWORD *pd
 											stTime.wYear = (WORD)StrToUNum32(pmralpsValues[i].lpszData, 4);

 											stTime.wMonth = (WORD)StrToUNum32((pmralpsValues[i].lpszData+5), 2);

 											stTime.wDay = (WORD)StrToUNum32((pmralpsValues[i].lpszData+8), 2);

-											mraSetWord(hContact, "BirthYear", stTime.wYear);

-											mraSetByte(hContact, "BirthMonth", (BYTE)stTime.wMonth);

-											mraSetByte(hContact, "BirthDay", (BYTE)stTime.wDay);

+											setWord(hContact, "BirthYear", stTime.wYear);

+											setByte(hContact, "BirthMonth", (BYTE)stTime.wMonth);

+											setByte(hContact, "BirthDay", (BYTE)stTime.wDay);

 

-											mraSetWord(hContact, "Age", (WORD)GetYears(&stTime));

+											setWord(hContact, "Age", (WORD)GetYears(&stTime));

 										}

 										else {

 											mraDelValue(hContact, "BirthYear");

@@ -1020,7 +1020,7 @@ DWORD CMraProto::MraCommandDispatcher(mrim_packet_header_t *pmaHeader, DWORD *pd
 											if (dwID == -1 || (dwContactSeverFlags & CONTACT_INTFLAG_NOT_AUTHORIZED)) {

 												dwStatus = StrHexToUNum32(pmralpsValues[i].lpszData, pmralpsValues[i].dwSize);

 												MraSetContactStatus(hContact, GetMiradaStatusFromMraStatus(dwStatus, MRA_MIR_XSTATUS_NONE, NULL));

-												mraSetByte(hContact, DBSETTING_XSTATUSID, (BYTE)MRA_MIR_XSTATUS_NONE);

+												setByte(hContact, DBSETTING_XSTATUSID, (BYTE)MRA_MIR_XSTATUS_NONE);

 											}

 										}

 									}

@@ -1031,7 +1031,7 @@ DWORD CMraProto::MraCommandDispatcher(mrim_packet_header_t *pmaHeader, DWORD *pd
 											GetContactBasicInfoW(hContact, &dwID, NULL, NULL, &dwContactSeverFlags, NULL, NULL, 0, NULL, NULL, 0, NULL, NULL, 0, NULL);

 											if (dwID == -1 || dwContactSeverFlags&CONTACT_INTFLAG_NOT_AUTHORIZED) {

 												MraSetContactStatus(hContact, GetMiradaStatusFromMraStatus(dwStatus, GetMraXStatusIDFromMraUriStatus(pmralpsValues[i].lpszData, pmralpsValues[i].dwSize), &dwXStatus));

-												mraSetByte(hContact, DBSETTING_XSTATUSID, (BYTE)dwXStatus);

+												setByte(hContact, DBSETTING_XSTATUSID, (BYTE)dwXStatus);

 											}

 										}

 									}

@@ -1157,7 +1157,7 @@ DWORD CMraProto::MraCommandDispatcher(mrim_packet_header_t *pmaHeader, DWORD *pd
 

 		dwAckType = dwEmailMessagesUnread;// save old value

 		dwEmailMessagesUnread = dwTemp;// store new value

-		if (mraGetByte(NULL, "IncrementalNewMailNotify", MRA_DEFAULT_INC_NEW_MAIL_NOTIFY) == 0 || dwAckType<dwTemp || dwTemp == 0)

+		if (getByte(NULL, "IncrementalNewMailNotify", MRA_DEFAULT_INC_NEW_MAIL_NOTIFY) == 0 || dwAckType<dwTemp || dwTemp == 0)

 			MraUpdateEmailStatus(NULL, 0, NULL, 0, 0, 0);

 		break;

 

@@ -1472,10 +1472,10 @@ DWORD CMraProto::MraCommandDispatcher(mrim_packet_header_t *pmaHeader, DWORD *pd
 							}

 

 							MraContactCapabilitiesSet(hContact, dwFutureFlags);

-							mraSetByte(hContact, DBSETTING_XSTATUSID, (BYTE)dwXStatus);

+							setByte(hContact, DBSETTING_XSTATUSID, (BYTE)dwXStatus);

 							mraSetLPSStringW(hContact, DBSETTING_XSTATUSNAME, &lpsStatusTitle);

 							mraSetLPSStringW(hContact, DBSETTING_XSTATUSMSG, &lpsStatusDesc);

-							mraSetDword(hContact, DBSETTING_BLOGSTATUSTIME, dwBlogStatusTime);

+							setDword(hContact, DBSETTING_BLOGSTATUSTIME, dwBlogStatusTime);

 							mraWriteContactSettingBlob(hContact, DBSETTING_BLOGSTATUSID, &dwBlogStatusID.QuadPart, sizeof(DWORDLONG));

 							mraSetLPSStringW(hContact, DBSETTING_BLOGSTATUS, &lpsBlogStatus);

 							mraSetLPSStringW(hContact, DBSETTING_BLOGSTATUSMUSIC, &lpsBlogStatusMusic);

@@ -1484,7 +1484,7 @@ DWORD CMraProto::MraCommandDispatcher(mrim_packet_header_t *pmaHeader, DWORD *pd
 

 							if (dwTemp != ID_STATUS_OFFLINE) { // пишем клиента только если юзер не отключён, иначе не затираем старое

 								if (lpsUserAgentFormated.dwSize) {

-									if (mraGetByte(NULL, "MirVerRaw", MRA_DEFAULT_MIRVER_RAW) == FALSE) {

+									if (getByte(NULL, "MirVerRaw", MRA_DEFAULT_MIRVER_RAW) == FALSE) {

 										MraGetVersionStringFromFormatted(lpsUserAgentFormated.lpszData, lpsUserAgentFormated.dwSize, (LPSTR)szBuff, SIZEOF(szBuff), &dwStringSize);

 										lpsUserAgentFormated.lpszData = (LPSTR)szBuff;

 										lpsUserAgentFormated.dwSize = dwStringSize;

@@ -1498,7 +1498,7 @@ DWORD CMraProto::MraCommandDispatcher(mrim_packet_header_t *pmaHeader, DWORD *pd
 							}

 

 							if (dwContactSeverFlags & CONTACT_INTFLAG_NOT_AUTHORIZED)

-							if (mraGetByte(NULL, "AutoAuthRequestOnLogon", MRA_DEFAULT_AUTO_AUTH_REQ_ON_LOGON))

+							if (getByte(NULL, "AutoAuthRequestOnLogon", MRA_DEFAULT_AUTO_AUTH_REQ_ON_LOGON))

 								CallProtoService(m_szModuleName, MRA_REQ_AUTH, (WPARAM)hContact, 0);

 						}

 					}

@@ -1532,7 +1532,7 @@ DWORD CMraProto::MraCommandDispatcher(mrim_packet_header_t *pmaHeader, DWORD *pd
 						else {

 							if (db_get_b(hContact, "CList", "NotOnList", 0) == 0) { // set extra icons and upload contact

 								SetExtraIcons(hContact);

-								if (mraGetByte(NULL, "AutoAddContactsToServer", MRA_DEFAULT_AUTO_ADD_CONTACTS_TO_SERVER)) { //add all contacts to server

+								if (getByte(NULL, "AutoAddContactsToServer", MRA_DEFAULT_AUTO_ADD_CONTACTS_TO_SERVER)) { //add all contacts to server

 									GetContactBasicInfoW(hContact, NULL, &dwGroupID, NULL, NULL, NULL, NULL, 0, NULL, wszNick, SIZEOF(wszNick), &dwNickSize, szPhones, SIZEOF(szPhones), &dwPhonesSize);

 									MraAddContactW(hContact, (CONTACT_FLAG_VISIBLE|CONTACT_FLAG_UNICODE_NAME), dwGroupID, szEMail, dwEMailSize, wszNick, dwNickSize, szPhones, dwPhonesSize, wszAuthMessage, dwAuthMessageSize, 0);

 								}

@@ -1682,7 +1682,7 @@ DWORD CMraProto::MraCommandDispatcher(mrim_packet_header_t *pmaHeader, DWORD *pd
 

 			dwAckType = dwEmailMessagesUnread;// save old value

 			dwEmailMessagesUnread = dwTemp;// store new value

-			if (mraGetByte(NULL, "IncrementalNewMailNotify", MRA_DEFAULT_INC_NEW_MAIL_NOTIFY) == 0 || dwAckType<dwTemp || dwTemp == 0)

+			if (getByte(NULL, "IncrementalNewMailNotify", MRA_DEFAULT_INC_NEW_MAIL_NOTIFY) == 0 || dwAckType<dwTemp || dwTemp == 0)

 				MraUpdateEmailStatus(lpsEMail.lpszData, lpsEMail.dwSize, lpsString.lpszData, lpsString.dwSize, dwDate, dwUIDL);

 		}

 		break;

@@ -1705,7 +1705,7 @@ DWORD CMraProto::MraCommandDispatcher(mrim_packet_header_t *pmaHeader, DWORD *pd
 				if (dwFlags & MRIM_BLOG_STATUS_MUSIC)

 					mraSetLPSStringW(hContact, DBSETTING_BLOGSTATUSMUSIC, &lpsText);

 				else {

-					mraSetDword(hContact, DBSETTING_BLOGSTATUSTIME, dwTime);

+					setDword(hContact, DBSETTING_BLOGSTATUSTIME, dwTime);

 					mraWriteContactSettingBlob(hContact, DBSETTING_BLOGSTATUSID, &dwBlogStatusID, sizeof(DWORDLONG));

 					mraSetLPSStringW(hContact, DBSETTING_BLOGSTATUS, &lpsText);

 				}

@@ -1991,10 +1991,10 @@ DWORD CMraProto::MraRecvCommand_Message(DWORD dwTime, DWORD dwFlags, MRA_LPS *pl
 					else {

 						// temporary contact

 						if (db_get_b(hContact, "CList", "NotOnList", 0)) {

-							if (mraGetByte(NULL, "AutoAuthGrandNewUsers", MRA_DEFAULT_AUTO_AUTH_GRAND_NEW_USERS))

+							if (getByte(NULL, "AutoAuthGrandNewUsers", MRA_DEFAULT_AUTO_AUTH_GRAND_NEW_USERS))

 								bAutoGrantAuth = TRUE;

 						}

-						else if (mraGetByte(NULL, "AutoAuthGrandUsersInCList", MRA_DEFAULT_AUTO_AUTH_GRAND_IN_CLIST))

+						else if (getByte(NULL, "AutoAuthGrandUsersInCList", MRA_DEFAULT_AUTO_AUTH_GRAND_IN_CLIST))

 							bAutoGrantAuth = TRUE;

 					}

 

@@ -2056,7 +2056,7 @@ DWORD CMraProto::MraRecvCommand_Message(DWORD dwTime, DWORD dwFlags, MRA_LPS *pl
 					}

 					else { // standart message// flash animation

 						// пишем в ANSI, всё равно RTF

-						if ((dwFlags & MESSAGE_FLAG_RTF) && (dwFlags & MESSAGE_FLAG_FLASH) == 0 && lpszMessageExt && dwMessageExtSize && mraGetByte(NULL, "RTFReceiveEnable", MRA_DEFAULT_RTF_RECEIVE_ENABLE)) {

+						if ((dwFlags & MESSAGE_FLAG_RTF) && (dwFlags & MESSAGE_FLAG_FLASH) == 0 && lpszMessageExt && dwMessageExtSize && getByte(NULL, "RTFReceiveEnable", MRA_DEFAULT_RTF_RECEIVE_ENABLE)) {

 							pre.flags = 0;

 							pre.szMessage = lpszMessageExt;

 							ProtoChainRecvMsg(hContact, &pre);