From 4882bc420186a4aef19be699e3f621dec932417d Mon Sep 17 00:00:00 2001 From: George Hazan Date: Fri, 2 Dec 2016 23:55:15 +0300 Subject: MS_SYSTEM_* services became functions --- protocols/IcqOscarJ/src/fam_01service.cpp | 2 +- protocols/IcqOscarJ/src/icq_avatar.cpp | 2 +- protocols/IcqOscarJ/src/userinfotab.cpp | 2 +- protocols/IcqOscarJ/src/utilities.cpp | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'protocols/IcqOscarJ/src') diff --git a/protocols/IcqOscarJ/src/fam_01service.cpp b/protocols/IcqOscarJ/src/fam_01service.cpp index 412dec2b39..161d9b10af 100644 --- a/protocols/IcqOscarJ/src/fam_01service.cpp +++ b/protocols/IcqOscarJ/src/fam_01service.cpp @@ -676,7 +676,7 @@ void CIcqProto::setUserInfo() packDWord(&packet, 0x6E64614E); WORD v[4]; - CallService(MS_SYSTEM_GETFILEVERSION, 0, (LPARAM)v); + Miranda_GetFileVersion(&v); packWord(&packet, v[0]); packWord(&packet, v[1]); packWord(&packet, v[2]); diff --git a/protocols/IcqOscarJ/src/icq_avatar.cpp b/protocols/IcqOscarJ/src/icq_avatar.cpp index 57616ecde7..6fd71d67e0 100644 --- a/protocols/IcqOscarJ/src/icq_avatar.cpp +++ b/protocols/IcqOscarJ/src/icq_avatar.cpp @@ -894,7 +894,7 @@ void avatars_server_connection::connectionThread() if (recvResult == SOCKET_ERROR) { if (GetLastError() == ERROR_TIMEOUT) { // timeout, check if we should be still running - if (Miranda_Terminated()) + if (Miranda_IsTerminated()) break; if (time(0) >= dwLastKeepAlive) { // limit frequency (HACK: on some systems select() does not work well) diff --git a/protocols/IcqOscarJ/src/userinfotab.cpp b/protocols/IcqOscarJ/src/userinfotab.cpp index e6be98831a..2f35f7e007 100644 --- a/protocols/IcqOscarJ/src/userinfotab.cpp +++ b/protocols/IcqOscarJ/src/userinfotab.cpp @@ -234,7 +234,7 @@ static INT_PTR CALLBACK IcqDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM else { char str[MAX_PATH]; WORD v[4]; - CallService(MS_SYSTEM_GETFILEVERSION, 0, (LPARAM)&v); + Miranda_GetFileVersion(&v); mir_snprintf(str, "Miranda NG %d.%d.%d.%d (ICQ %s)", v[0], v[1], v[2], v[3], __VERSION_STRING_DOTS); SetValue(ppro, hwndDlg, IDC_PORT, hContact, (char*)DBVT_WORD, (char*)ppro->wListenPort, SVS_ZEROISUNSPEC); diff --git a/protocols/IcqOscarJ/src/utilities.cpp b/protocols/IcqOscarJ/src/utilities.cpp index d15779ae08..49ef420754 100644 --- a/protocols/IcqOscarJ/src/utilities.cpp +++ b/protocols/IcqOscarJ/src/utilities.cpp @@ -1355,7 +1355,7 @@ DWORD ICQWaitForSingleObject(HANDLE hObject, DWORD dwMilliseconds, int bWaitAlwa do { // will get WAIT_IO_COMPLETION for QueueUserAPC(), ignore it unless terminating dwResult = WaitForSingleObjectEx(hObject, dwMilliseconds, TRUE); } - while (dwResult == WAIT_IO_COMPLETION && (bWaitAlways || !Miranda_Terminated())); + while (dwResult == WAIT_IO_COMPLETION && (bWaitAlways || !Miranda_IsTerminated())); return dwResult; } -- cgit v1.2.3