From 1039b2829a264280493ba0fa979214fe024dc70c Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sun, 26 Dec 2021 17:06:04 +0300 Subject: WORD -> uint16_t --- plugins/NotesAndReminders/src/miscutils.cpp | 4 ++-- plugins/NotesAndReminders/src/reminders.cpp | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'plugins/NotesAndReminders/src') diff --git a/plugins/NotesAndReminders/src/miscutils.cpp b/plugins/NotesAndReminders/src/miscutils.cpp index 058b93e263..c03ae641d0 100644 --- a/plugins/NotesAndReminders/src/miscutils.cpp +++ b/plugins/NotesAndReminders/src/miscutils.cpp @@ -10,7 +10,7 @@ int WS_Send(SOCKET s, const char *data, int datalen) return TRUE; } -unsigned long WS_ResolveName(char *name, WORD *port, int defaultPort) +unsigned long WS_ResolveName(char *name, uint16_t *port, int defaultPort) { char *nameCopy = _strdup(name); if (port != nullptr) @@ -39,7 +39,7 @@ void Send(char *user, char *host, const char *Msg, char *server) if (!server) server = host; - WORD port; + uint16_t port; SOCKADDR_IN sockaddr; if ((sockaddr.sin_addr.S_un.S_addr = WS_ResolveName(server, &port, 25)) == SOCKET_ERROR) return; diff --git a/plugins/NotesAndReminders/src/reminders.cpp b/plugins/NotesAndReminders/src/reminders.cpp index 8ce6e253a5..36eb94843a 100644 --- a/plugins/NotesAndReminders/src/reminders.cpp +++ b/plugins/NotesAndReminders/src/reminders.cpp @@ -58,7 +58,7 @@ static bool bNewReminderVisible = false; static UINT QueuedReminderCount = 0; int WS_Send(SOCKET s, char *data, int datalen); -unsigned long WS_ResolveName(char *name, WORD *port, int defaultPort); +unsigned long WS_ResolveName(char *name, uint16_t *port, int defaultPort); void Send(char *user, char *host, const char *Msg, char* server); wchar_t* GetPreviewString(const wchar_t *lpsz); @@ -800,8 +800,8 @@ protected: // cur time FileTimeToTzLocalST((FILETIME *)&li, &tm2); - WORD wCurHour = tm2.wHour; - WORD wCurMinute = tm2.wMinute; + uint16_t wCurHour = tm2.wHour; + uint16_t wCurMinute = tm2.wMinute; mir_snwprintf(s, L"%02d:%02d", (UINT)tm2.wHour, (UINT)tm2.wMinute); cmbTime.AddString(s, (li - ref) / FILETIME_TICKS_PER_SEC); @@ -938,8 +938,8 @@ protected: SYSTEMTIME tmTriggerLocal, tmTriggerLocal2; tmTriggerLocal = tmRefLocal; - tmTriggerLocal.wHour = (WORD)h; - tmTriggerLocal.wMinute = (WORD)m; + tmTriggerLocal.wHour = (uint16_t)h; + tmTriggerLocal.wMinute = (uint16_t)m; tmTriggerLocal.wSecond = 0; tmTriggerLocal.wMilliseconds = 0; -- cgit v1.2.3