diff options
Diffstat (limited to 'protocols/Sametime/src')
| -rw-r--r-- | protocols/Sametime/src/options.cpp | 4 | ||||
| -rw-r--r-- | protocols/Sametime/src/sametime_proto.h | 4 | ||||
| -rw-r--r-- | protocols/Sametime/src/sametime_session.cpp | 8 |
3 files changed, 8 insertions, 8 deletions
diff --git a/protocols/Sametime/src/options.cpp b/protocols/Sametime/src/options.cpp index 44fddd4a4d..185e7d947e 100644 --- a/protocols/Sametime/src/options.cpp +++ b/protocols/Sametime/src/options.cpp @@ -100,14 +100,14 @@ static INT_PTR CALLBACK DlgProcOptNet(HWND hwndDlg, UINT msg, WPARAM wParam, LPA SetWindowLongPtr(hwndDlg, GWLP_USERDATA, lParam);
proto = (CSametimeProto*)lParam;
- WORD client_ver = proto->GetClientVersion();
+ uint16_t client_ver = proto->GetClientVersion();
if (client_ver) {
wchar_t verbuf[100];
mir_snwprintf(verbuf, TranslateT("Client protocol version: %03d.%03d"), (client_ver & 0xFF00) >> 8, client_ver & 0xFF);
SetDlgItemText(hwndDlg, IDC_ST_CLIENTVER, verbuf);
}
- WORD server_ver = proto->GetServerVersion();
+ uint16_t server_ver = proto->GetServerVersion();
if (server_ver) {
wchar_t verbuf[100];
mir_snwprintf(verbuf, TranslateT("Server protocol version: %03d.%03d"), (server_ver & 0xFF00) >> 8, server_ver & 0xFF);
diff --git a/protocols/Sametime/src/sametime_proto.h b/protocols/Sametime/src/sametime_proto.h index 2f1cf45750..d38daef4ae 100644 --- a/protocols/Sametime/src/sametime_proto.h +++ b/protocols/Sametime/src/sametime_proto.h @@ -108,8 +108,8 @@ struct CSametimeProto : public PROTO<CSametimeProto> void UpdateSelfStatus();
int SetIdle(bool idle);
void SetSessionAwayMessage(int status, const wchar_t* msg);
- WORD GetClientVersion();
- WORD GetServerVersion();
+ uint16_t GetClientVersion();
+ uint16_t GetServerVersion();
INT_PTR __cdecl SessionAnnounce(WPARAM wParam, LPARAM lParam);
void InitAwayMsg();
void DeinitAwayMsg();
diff --git a/protocols/Sametime/src/sametime_session.cpp b/protocols/Sametime/src/sametime_session.cpp index 2eef58c14a..925681abdd 100644 --- a/protocols/Sametime/src/sametime_session.cpp +++ b/protocols/Sametime/src/sametime_session.cpp @@ -449,21 +449,21 @@ void __cdecl CSametimeProto::SessionThread(LPVOID) return;
}
-WORD CSametimeProto::GetClientVersion()
+uint16_t CSametimeProto::GetClientVersion()
{
if (!session) return 0;
- WORD retval = 0;
+ uint16_t retval = 0;
retval = (UINT_PTR)mwSession_getProperty(session, mwSession_CLIENT_VER_MAJOR) << 8;
retval |= (UINT_PTR)mwSession_getProperty(session, mwSession_CLIENT_VER_MINOR);
return retval;
}
-WORD CSametimeProto::GetServerVersion()
+uint16_t CSametimeProto::GetServerVersion()
{
if (!session) return 0;
- WORD retval = 0;
+ uint16_t retval = 0;
retval = (UINT_PTR)mwSession_getProperty(session, mwSession_SERVER_VER_MAJOR) << 8;
retval |= (UINT_PTR)mwSession_getProperty(session, mwSession_SERVER_VER_MINOR);
return retval;
|