MS_SYSTEM_* services became functions

6 files changed, 6 insertions, 6 deletions

diff --git a/protocols/AimOscar/src/client.cpp b/protocols/AimOscar/src/client.cpp
index 220d93ab51..d428154a0a 100755
--- a/protocols/AimOscar/src/client.cpp
+++ b/protocols/AimOscar/src/client.cpp
@@ -53,7 +53,7 @@ int CAimProto::aim_auth_request(HANDLE hServerConn, unsigned short &seqno, const
 	mir_md5_finish(&state, auth_hash);

 

 	char client_id[64], mirver[64];

-	CallService(MS_SYSTEM_GETVERSIONTEXT, sizeof(mirver), (LPARAM)mirver);

+	Miranda_GetVersionText(mirver, sizeof(mirver));

 	int client_id_len = mir_snprintf(client_id, "Miranda AIM, version %s", mirver);

 

 	char* buf = (char*)alloca(SNAC_SIZE + TLV_HEADER_SIZE * 13 + MD5_HASH_LENGTH + mir_strlen(username) + client_id_len + 30 + mir_strlen(language) + mir_strlen(country));

diff --git a/protocols/AimOscar/src/connection.cpp b/protocols/AimOscar/src/connection.cpp
index 45f7416536..cb4fbf092f 100755
--- a/protocols/AimOscar/src/connection.cpp
+++ b/protocols/AimOscar/src/connection.cpp
@@ -391,7 +391,7 @@ void __cdecl CAimProto::aim_protocol_negotiation(void*)
 					{

 						unsigned short offset = 0;

 						char client_id[64], mirver[64];

-						CallService(MS_SYSTEM_GETVERSIONTEXT, sizeof(mirver), (LPARAM)mirver);

+						Miranda_GetVersionText(mirver, sizeof(mirver));

 						int client_id_len = mir_snprintf(client_id, "Miranda AIM, version %s", mirver);

 

 						char* buf_ = (char*)alloca(SNAC_SIZE + TLV_HEADER_SIZE * 8 + COOKIE_LENGTH + client_id_len + 30); //TODO: correct length

diff --git a/protocols/AimOscar/src/direct_connect.cpp b/protocols/AimOscar/src/direct_connect.cpp
index c4d026515d..fa1f8ea22c 100644
--- a/protocols/AimOscar/src/direct_connect.cpp
+++ b/protocols/AimOscar/src/direct_connect.cpp
@@ -44,7 +44,7 @@ void __cdecl CAimProto::aim_dc_helper(void* param) //only called when we are ini
 	if (result == 0)

 		ProtoBroadcastAck(ft->hContact, ACKTYPE_FILE, ACKRESULT_SUCCESS, ft, 0);

 	else {

-		if (!ft->requester && result == 1 && !Miranda_Terminated()) {

+		if (!ft->requester && result == 1 && !Miranda_IsTerminated()) {

 			ft->accepted = false;

 			HANDLE hConn = aim_peer_connect(AIM_PROXY_SERVER, get_default_port());

 			if (hConn) {

diff --git a/protocols/AimOscar/src/proxy.cpp b/protocols/AimOscar/src/proxy.cpp
index 35076518ae..10e04df718 100644
--- a/protocols/AimOscar/src/proxy.cpp
+++ b/protocols/AimOscar/src/proxy.cpp
@@ -105,7 +105,7 @@ void __cdecl CAimProto::aim_proxy_helper(void* param)
 				int i;

 				for (i = 21; --i; )

 				{

-					if (Miranda_Terminated()) return;

+					if (Miranda_IsTerminated()) return;

 					Sleep(100);

 					if (ft->accepted) break;

 				}

diff --git a/protocols/AimOscar/src/server.cpp b/protocols/AimOscar/src/server.cpp
index 50bddbceb9..7b9b04854d 100644
--- a/protocols/AimOscar/src/server.cpp
+++ b/protocols/AimOscar/src/server.cpp
@@ -941,7 +941,7 @@ void CAimProto::snac_contact_list(SNAC &snac, HANDLE hServerConn, unsigned short
 

 			if (getDword(AIM_KEY_LV, 0) < 0x80500) {

 				upload_nicks();

-				setDword(AIM_KEY_LV, (DWORD)CallService(MS_SYSTEM_GETVERSION, 0, 0));

+				setDword(AIM_KEY_LV, Miranda_GetVersion());

 			}

 

 			if (getByte(AIM_KEY_CM, 0))

diff --git a/protocols/AimOscar/src/utility.cpp b/protocols/AimOscar/src/utility.cpp
index 6ac3457ed4..1e9601c836 100755
--- a/protocols/AimOscar/src/utility.cpp
+++ b/protocols/AimOscar/src/utility.cpp
@@ -149,7 +149,7 @@ bool CAimProto::wait_conn(HANDLE& hConn, HANDLE& hEvent, unsigned short service)
 	if (WaitForSingleObjectEx(hEvent, 10000, TRUE) != WAIT_OBJECT_0)

 		return false;

 

-	if (Miranda_Terminated() || m_iStatus == ID_STATUS_OFFLINE)

+	if (Miranda_IsTerminated() || m_iStatus == ID_STATUS_OFFLINE)

 		return false;

 

 	return true;